1 From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010
2 Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org>
3 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org
5 X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled
7 X-Original-To: jk@ozlabs.org
8 Delivered-To: jk@ozlabs.org
9 Received: from bilbo.ozlabs.org (localhost [127.0.0.1])
10 by ozlabs.org (Postfix) with ESMTP id ED4B3100937
11 for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST)
12 Received: by ozlabs.org (Postfix)
13 id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST)
14 Delivered-To: linuxppc-dev@ozlabs.org
15 Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])
16 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
17 (Client did not present a certificate)
18 by ozlabs.org (Postfix) with ESMTPS id 94629B7043
19 for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST)
20 Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1])
21 by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234;
22 Thu, 21 Oct 2010 22:51:04 -0500
23 Subject: [git pull] Please pull powerpc.git next branch
24 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
25 To: Linus Torvalds <torvalds@linux-foundation.org>
26 Date: Fri, 22 Oct 2010 14:51:02 +1100
27 Message-ID: <1287719462.2198.37.camel@pasglop>
29 X-Mailer: Evolution 2.30.3
30 Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
31 Andrew Morton <akpm@linux-foundation.org>,
32 Linux Kernel list <linux-kernel@vger.kernel.org>
33 X-BeenThere: linuxppc-dev@lists.ozlabs.org
34 X-Mailman-Version: 2.1.13
36 List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org>
37 List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
38 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
39 List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev>
40 List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
41 List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
42 List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
43 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>
44 Content-Type: text/plain;
46 Content-Transfer-Encoding: 7bit
47 Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org
48 Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org
53 X-KMail-EncryptionState:
54 X-KMail-SignatureState:
57 The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479:
59 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev
61 are available in the git repository at:
63 git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
67 x86-32: Make sure the stack is set up before we use it
69 x86, nx: Don't force pages RW when setting NX bits
72 x86, mtrr: Avoid MTRR reprogramming on BP during boot on UP platforms
75 arch/x86/include/asm/smp.h | 5 +----
76 arch/x86/kernel/acpi/sleep.c | 2 +-
77 arch/x86/kernel/cpu/mtrr/main.c | 10 +++++++++-
78 arch/x86/kernel/head_32.S | 30 +++++++++++++-----------------
79 arch/x86/kernel/smpboot.c | 4 ++--
80 arch/x86/mm/pageattr.c | 8 --------
81 6 files changed, 26 insertions(+), 33 deletions(-)
82 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
83 index 4c2f63c..1f46951 100644
84 --- a/arch/x86/include/asm/smp.h
85 +++ b/arch/x86/include/asm/smp.h
86 @@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
87 DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
89 /* Static state in head.S used to set up a CPU */
94 +extern unsigned long stack_start; /* Initial stack pointer address */
97 void (*smp_prepare_boot_cpu)(void);
98 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
99 index 69fd72a..4d9ebba 100644
100 --- a/arch/x86/kernel/acpi/sleep.c
101 +++ b/arch/x86/kernel/acpi/sleep.c
102 @@ -100,7 +100,7 @@ int acpi_save_state_mem(void)
103 #else /* CONFIG_64BIT */
104 header->trampoline_segment = setup_trampoline() >> 4;
106 - stack_start.sp = temp_stack + sizeof(temp_stack);
107 + stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
108 early_gdt_descr.address =
109 (unsigned long)get_cpu_gdt_table(smp_processor_id());
110 initial_gs = per_cpu_offset(smp_processor_id());
111 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
112 index 01c0f3e..bebabec 100644
113 --- a/arch/x86/kernel/cpu/mtrr/main.c
114 +++ b/arch/x86/kernel/cpu/mtrr/main.c
115 @@ -793,13 +793,21 @@ void set_mtrr_aps_delayed_init(void)
119 - * MTRR initialization for all AP's
120 + * Delayed MTRR initialization for all AP's
122 void mtrr_aps_init(void)
128 + * Check if someone has requested the delay of AP MTRR initialization,
129 + * by doing set_mtrr_aps_delayed_init(), prior to this point. If not,
130 + * then we are done.
132 + if (!mtrr_aps_delayed_init)
135 set_mtrr(~0U, 0, 0, 0);
136 mtrr_aps_delayed_init = false;
138 _______________________________________________
139 Linuxppc-dev mailing list
140 Linuxppc-dev@lists.ozlabs.org
141 https://lists.ozlabs.org/listinfo/linuxppc-dev