Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/kernel/Makefile
	include/asm-x86/pda.h

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/kernel/Makefile
index d001739d8b069d8b2d572c25aedfdef6b23a6472,0d41f0343dc0753e5be4c97fd8b36460bc0ab2a5..50632e16d01c8b3f9c02b7519d0f6a16394cfeab
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -13,21 -20,21 +20,22 @@@ endi
  nostackp := $(call cc-option, -fno-stack-protector)
  CFLAGS_vsyscall_64.o  := $(PROFILING) -g0 $(nostackp)
  CFLAGS_hpet.o         := $(nostackp)
- CFLAGS_tsc_64.o               := $(nostackp)
+ CFLAGS_tsc.o          := $(nostackp)
 +CFLAGS_paravirt.o     := $(nostackp)
  
  obj-y                 := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
- obj-y                 += traps_$(BITS).o irq_$(BITS).o
+ obj-y                 += traps.o irq_$(BITS).o dumpstack_$(BITS).o
  obj-y                 += time_$(BITS).o ioport.o ldt.o
- obj-y                 += setup_$(BITS).o i8259_$(BITS).o setup.o
+ obj-y                 += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o
+ obj-$(CONFIG_X86_VISWS)       += visws_quirks.o
+ obj-$(CONFIG_X86_32)  += probe_roms_32.o
  obj-$(CONFIG_X86_32)  += sys_i386_32.o i386_ksyms_32.o
  obj-$(CONFIG_X86_64)  += sys_x86_64.o x8664_ksyms_64.o
- obj-$(CONFIG_X86_64)  += syscall_64.o vsyscall_64.o setup64.o
- obj-y                 += bootflag.o e820_$(BITS).o
+ obj-$(CONFIG_X86_64)  += syscall_64.o vsyscall_64.o
+ obj-y                 += bootflag.o e820.o
  obj-y                 += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
  obj-y                 += alternative.o i8253.o pci-nommu.o
- obj-$(CONFIG_X86_64)  += bugs_64.o
- obj-y                 += tsc_$(BITS).o io_delay.o rtc.o
+ obj-y                 += tsc.o io_delay.o rtc.o
  
  obj-$(CONFIG_X86_TRAMPOLINE)  += trampoline.o
  obj-y                         += process.o

diff --cc arch/x86/kernel/process_64.c
index f73cfbc2c28133e58151fa4e83faf458b5c63944,cd8c0ed02b7e2c017905a403f10fc3cd25413f4a..749d5f888d4df3ebc07a4606684bd3f4054f1c23
--- 1/arch/x86/kernel/process_64.c
--- 2/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -147,27 -102,13 +103,24 @@@ static inline void play_dead(void
  void cpu_idle(void)
  {
        current_thread_info()->status |= TS_POLLING;
 +
 +      /*
 +       * If we're the non-boot CPU, nothing set the PDA stack
 +       * canary up for us - and if we are the boot CPU we have
 +       * a 0 stack canary. This is a good place for updating
 +       * it, as we wont ever return from this function (so the
 +       * invalid canaries already on the stack wont ever
 +       * trigger):
 +       */
 +      boot_init_stack_canary();
 +
        /* endless idle loop with no priority at all */
        while (1) {
-               tick_nohz_stop_sched_tick();
+               tick_nohz_stop_sched_tick(1);
                while (!need_resched()) {
-                       void (*idle)(void);
  
                        rmb();
-                       idle = pm_idle;
-                       if (!idle)
-                               idle = default_idle;
+ 
                        if (cpu_is_offline(smp_processor_id()))
                                play_dead();
                        /*
@@@ -648,11 -634,13 +646,12 @@@ __switch_to(struct task_struct *prev_p
         */
        prev->usersp = read_pda(oldrsp);
        write_pda(oldrsp, next->usersp);
-       write_pda(pcurrent, next_p); 
+       write_pda(pcurrent, next_p);
  
        write_pda(kernelstack,
-       (unsigned long)task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET);
+                 (unsigned long)task_stack_page(next_p) +
+                 THREAD_SIZE - PDA_STACKOFFSET);
  #ifdef CONFIG_CC_STACKPROTECTOR
 -      write_pda(stack_canary, next_p->stack_canary);
        /*
         * Build time only check to make sure the stack_canary is at
         * offset 40 in the pda; this is a gcc ABI requirement

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc include/asm-x86/pda.h
index a5ff5bb762995849eae3acb219365834353aa96f,80860afffbdbbede4092bb18a6946e5b0a2831f9..45fd2aee8d6a7306f5967ef84d378c79f29ca6d8
--- 1/include/asm-x86/pda.h
--- 2/include/asm-x86/pda.h
+++ b/include/asm-x86/pda.h
@@@ -19,7 -19,11 +19,9 @@@ struct x8664_pda 
        unsigned long stack_canary;     /* 40 stack canary value */
                                        /* gcc-ABI: this canary MUST be at
                                           offset 40!!! */
 -#endif
        char *irqstackptr;
+       short nodenumber;               /* number of current node (32k max) */
+       short in_bootmem;               /* pda lives in bootmem */
        unsigned int __softirq_pending;
        unsigned int __nmi_count;       /* number of NMI on this CPUs */
        short mmu_state;
@@@ -131,5 -134,4 +132,6 @@@ do {                                                                       
  
  #define PDA_STACKOFFSET (5*8)
  
- #endif
 +#define refresh_stack_canary() write_pda(stack_canary, current->stack_canary)
++
+ #endif /* ASM_X86__PDA_H */

diff --cc include/asm-x86/system.h
Simple merge

diff --cc include/linux/magic.h
Simple merge

diff --cc include/linux/sched.h
index f0132f9ef4ddafb8f064a2af507042dde372c60c,c226c7b82946ce1d830853c4fd3b9bad3d92fa0d..1a7e8461db5a1174192933878476fe773fd6506c
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1968,21 -1965,15 +1964,28 @@@ static inline unsigned long *end_of_sta
  
  #endif
  
+ static inline int object_is_on_stack(void *obj)
+ {
+       void *stack = task_stack_page(current);
+ 
+       return (obj >= stack) && (obj < (stack + THREAD_SIZE));
+ }
+ 
  extern void thread_info_cache_init(void);
  
 +#ifdef CONFIG_DEBUG_STACK_USAGE
 +static inline unsigned long stack_not_used(struct task_struct *p)
 +{
 +      unsigned long *n = end_of_stack(p);
 +
 +      do {    /* Skip over canary */
 +              n++;
 +      } while (!*n);
 +
 +      return (unsigned long)n - (unsigned long)end_of_stack(p);
 +}
 +#endif
 +
  /* set thread flags in other task's structures
   * - see asm/thread_info.h for TIF_xxxx flags available
   */

diff --cc init/main.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/panic.c
Simple merge

diff --cc kernel/sched.c
Simple merge