From: Alexey Dobriyan <adobriyan@gmail.com>
To: Jaswinder Singh Rajput <jaswinder@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>, x86 maintainers <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [git-pull -tip] x86: include inverse Xmas tree patches
Date: Sat, 28 Mar 2009 18:07:46 +0300 [thread overview]
Message-ID: <20090328150746.GA3268@x200.localdomain> (raw)
In-Reply-To: <1238251730.2526.2.camel@ht.satnam>
On Sat, Mar 28, 2009 at 08:18:50PM +0530, Jaswinder Singh Rajput wrote:
> The following changes since commit 29219683c46cb89edf5c58418b5305b14646d030:
> Ingo Molnar (1):
> Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and 'x86/signal'; commit 'v2.6.29' into x86/core
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-Xmas.git x86/core
>
> Jaswinder Singh Rajput (49):
> x86: process_32.c include inverse Xmas tree effect
What the heck is this?
> x86: signal.c include inverse Xmas tree effect
> x86: entry_32.S include inverse Xmas tree effect
> x86: traps.c include inverse Xmas tree effect
> x86: irq.c include inverse Xmas tree effect
> x86: irq_32.c include inverse Xmas tree effect
> x86: dumpstack.c include inverse Xmas tree effect
> x86: time_32.c include inverse Xmas tree effect
> x86: ioport.c include inverse Xmas tree effect
> x86: ldt.c include inverse Xmas tree effect
> x86: dumpstack_32.c include inverse Xmas tree effect
> x86: setup.c include inverse Xmas tree effect
> x86: i8259.c include inverse Xmas tree effect
> x86: irqinit_32.c include inverse Xmas tree effect
> x86: probe_roms_32.c include inverse Xmas tree effect
> x86: sys_i386_32.c include inverse Xmas tree effect
> x86: i386_ksyms_32.c include inverse Xmas tree effect
> x86: bootflag.c include inverse Xmas tree effect
> x86: e820.c include inverse Xmas tree effect
> x86: pci-dma.c include inverse Xmas tree effect
> x86: quirks.c include inverse Xmas tree effect
> x86: i8237.c include inverse Xmas tree effect
> x86: alternative.c include inverse Xmas tree effect
> x86: tsc.c include inverse Xmas tree effect
> x86: process.c include inverse Xmas tree effect
> x86: xsave.c include inverse Xmas tree effect
> x86: ptrace.c include inverse Xmas tree effect
> x86: ds.c include inverse Xmas tree effect
> x86: tls.c include inverse Xmas tree effect
> x86: step.c include inverse Xmas tree effect
> x86: stacktrace.c include inverse Xmas tree effect
> x86: reboot.c include inverse Xmas tree effect
> x86: msr.c include inverse Xmas tree effect
> x86: cpuid.c include inverse Xmas tree effect
> x86: early-quirks.c include inverse Xmas tree effect
> x86: smp.c include inverse Xmas tree effect
> x86: smpboot.c include inverse Xmas tree effect
> x86: tsc_sync.c include inverse Xmas tree effect
> x86: setup_percpu.c include inverse Xmas tree effect
> x86: trampoline_32.S include inverse Xmas tree effect
> x86: mpparse.c include inverse Xmas tree effect
> x86: module_32.c include inverse Xmas tree effect
> x86: doublefault_32.c include inverse Xmas tree effect
> x86: vm86_32.c include inverse Xmas tree effect
> ix86: early_printk.c include inverse Xmas tree effect
> x86: pcspeaker.c include inverse Xmas tree effect
> x86: head_32.c include inverse Xmas tree effect
> x86: head.c include inverse Xmas tree effect
> x86: init_task.c include inverse Xmas tree effect
>
> arch/x86/include/asm/proto.h | 2 +
> arch/x86/include/asm/sigcontext32.h | 3 +-
> arch/x86/include/asm/smpboot_hooks.h | 2 +
> arch/x86/include/asm/topology.h | 2 +
> arch/x86/kernel/alternative.c | 11 ++--
> arch/x86/kernel/bootflag.c | 12 ++--
> arch/x86/kernel/cpuid.c | 17 ++---
> arch/x86/kernel/doublefault_32.c | 8 +-
> arch/x86/kernel/ds.c | 11 +--
> arch/x86/kernel/dumpstack.c | 5 +-
> arch/x86/kernel/dumpstack_32.c | 5 +-
> arch/x86/kernel/e820.c | 21 +++---
> arch/x86/kernel/early-quirks.c | 9 ++-
> arch/x86/kernel/early_printk.c | 26 ++++---
> arch/x86/kernel/entry_32.S | 17 +++--
> arch/x86/kernel/head.c | 2 +-
> arch/x86/kernel/head_32.S | 17 +++--
> arch/x86/kernel/i386_ksyms_32.c | 3 +-
> arch/x86/kernel/i8237.c | 3 +-
> arch/x86/kernel/i8259.c | 28 ++++----
> arch/x86/kernel/init_task.c | 8 +-
> arch/x86/kernel/ioport.c | 15 ++--
> arch/x86/kernel/irq.c | 11 ++--
> arch/x86/kernel/irq_32.c | 10 ++--
> arch/x86/kernel/irqinit_32.c | 29 ++++----
> arch/x86/kernel/ldt.c | 14 ++--
> arch/x86/kernel/module_32.c | 7 +-
> arch/x86/kernel/mpparse.c | 24 +++---
> arch/x86/kernel/msr.c | 17 ++---
> arch/x86/kernel/pci-dma.c | 10 ++--
> arch/x86/kernel/pcspeaker.c | 2 +-
> arch/x86/kernel/probe_roms_32.c | 23 +++---
> arch/x86/kernel/process.c | 19 +++---
> arch/x86/kernel/process_32.c | 70 +++++++++----------
> arch/x86/kernel/ptrace.c | 30 ++++----
> arch/x86/kernel/quirks.c | 4 +-
> arch/x86/kernel/reboot.c | 30 ++++----
> arch/x86/kernel/setup.c | 126 ++++++++++++++++------------------
> arch/x86/kernel/setup_percpu.c | 21 +++---
> arch/x86/kernel/signal.c | 33 ++++-----
> arch/x86/kernel/smp.c | 16 ++--
> arch/x86/kernel/smpboot.c | 33 ++++-----
> arch/x86/kernel/stacktrace.c | 6 +-
> arch/x86/kernel/step.c | 3 +-
> arch/x86/kernel/sys_i386_32.c | 25 +++----
> arch/x86/kernel/time_32.c | 7 +-
> arch/x86/kernel/tls.c | 10 ++--
> arch/x86/kernel/trampoline_32.S | 3 +-
> arch/x86/kernel/traps.c | 34 +++------
> arch/x86/kernel/tsc.c | 20 +++---
> arch/x86/kernel/tsc_sync.c | 2 +-
> arch/x86/kernel/vm86_32.c | 20 +++---
> arch/x86/kernel/xsave.c | 5 +-
> 53 files changed, 437 insertions(+), 454 deletions(-)
>
> Complete diff:
> diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h
> index 49fb3ec..a8d63be 100644
> --- a/arch/x86/include/asm/proto.h
> +++ b/arch/x86/include/asm/proto.h
> @@ -7,7 +7,9 @@
>
> extern void early_idt_handler(void);
>
> +#ifdef CONFIG_X86_64
> extern void system_call(void);
> +#endif
> extern void syscall_init(void);
>
> extern void ia32_syscall(void);
> diff --git a/arch/x86/include/asm/sigcontext32.h b/arch/x86/include/asm/sigcontext32.h
> index ad1478c..f80df2e 100644
> --- a/arch/x86/include/asm/sigcontext32.h
> +++ b/arch/x86/include/asm/sigcontext32.h
> @@ -1,6 +1,7 @@
> #ifndef _ASM_X86_SIGCONTEXT32_H
> #define _ASM_X86_SIGCONTEXT32_H
>
> +#ifdef CONFIG_IA32_EMULATION
> #include <linux/types.h>
>
> /* signal context for 32bit programs. */
> @@ -73,5 +74,5 @@ struct sigcontext_ia32 {
> unsigned int oldmask;
> unsigned int cr2;
> };
> -
> +#endif
> #endif /* _ASM_X86_SIGCONTEXT32_H */
> diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h
> index 1def601..dff6e11 100644
> --- a/arch/x86/include/asm/smpboot_hooks.h
> +++ b/arch/x86/include/asm/smpboot_hooks.h
> @@ -1,6 +1,8 @@
> /* two abstractions specific to kernel/smpboot.c, mainly to cater to visws
> * which needs to alter them. */
>
> +#include <asm/tlbflush.h>
> +
> static inline void smpboot_clear_io_apic_irqs(void)
> {
> #ifdef CONFIG_X86_IO_APIC
> diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
> index 77cfb2c..1f23e58 100644
> --- a/arch/x86/include/asm/topology.h
> +++ b/arch/x86/include/asm/topology.h
> @@ -194,10 +194,12 @@ extern int __node_distance(int, int);
>
> #else /* !CONFIG_NUMA */
>
> +#if 0
> static inline int numa_node_id(void)
> {
> return 0;
> }
> +#endif
>
> static inline int cpu_to_node(int cpu)
> {
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index 4c80f15..51fb5c5 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -1,17 +1,18 @@
> +#include <linux/kprobes.h>
> +#include <linux/vmalloc.h>
> #include <linux/module.h>
> -#include <linux/sched.h>
next prev parent reply other threads:[~2009-03-28 15:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 14:48 Jaswinder Singh Rajput
2009-03-28 15:07 ` Joerg Roedel
2009-03-28 16:48 ` Jaswinder Singh Rajput
2009-03-28 17:16 ` Jaswinder Singh Rajput
2009-03-28 15:07 ` Alexey Dobriyan [this message]
2009-03-28 15:55 ` Alan Cox
2009-03-28 15:58 ` Alexey Dobriyan
2009-03-28 16:11 ` Jaswinder Singh Rajput
2009-03-28 16:28 ` Alan Cox
2009-03-28 19:03 ` Sam Ravnborg
2009-03-28 22:25 ` H. Peter Anvin
2009-03-28 22:37 ` Al Viro
2009-03-28 23:31 ` Thomas Gleixner
2009-03-28 23:34 ` Ingo Molnar
2009-03-28 23:39 ` Thomas Gleixner
2009-03-29 0:00 ` Ingo Molnar
2009-03-29 0:24 ` Al Viro
2009-03-29 10:25 ` Alexey Dobriyan
2009-03-29 0:28 ` Thomas Gleixner
2009-03-29 1:58 ` Ingo Molnar
2009-03-29 7:57 ` Jaswinder Singh Rajput
2009-03-28 15:17 ` Hugh Dickins
2009-03-28 23:40 ` Ingo Molnar
2009-03-29 6:38 ` Jaswinder Singh Rajput
2009-03-29 11:46 ` Thomas Gleixner
2009-03-29 14:38 ` Jaswinder Singh Rajput
2009-03-28 23:35 ` Ingo Molnar
2009-03-29 5:54 ` Jaswinder Singh Rajput
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090328150746.GA3268@x200.localdomain \
--to=adobriyan@gmail.com \
--cc=jaswinder@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®