Merge branch 'linus' into stackprotector

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c

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/include/asm/pda.h
index 45fd2aee8d6a7306f5967ef84d378c79f29ca6d8,2fbfff88df37b5dec026772c61ac2b11fa61e1be..3fea2fdb330294b7dfc68603565b20654182bdfa
--- 1/include/asm-x86/pda.h
--- 2/arch/x86/include/asm/pda.h
+++ b/arch/x86/include/asm/pda.h
@@@ -132,6 -134,4 +132,6 @@@ do {                                                                       
  
  #define PDA_STACKOFFSET (5*8)
  
- #endif /* ASM_X86__PDA_H */
 +#define refresh_stack_canary() write_pda(stack_canary, current->stack_canary)
 +
+ #endif /* _ASM_X86_PDA_H */

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

diff --cc arch/x86/kernel/Makefile
index 50632e16d01c8b3f9c02b7519d0f6a16394cfeab,d364df03c1d6419ce4473e23b420d86167343775..eb074530c7d3b859025581aaa1770cd1baf6d175
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -21,11 -23,10 +23,11 @@@ nostackp := $(call cc-option, -fno-stac
  CFLAGS_vsyscall_64.o  := $(PROFILING) -g0 $(nostackp)
  CFLAGS_hpet.o         := $(nostackp)
  CFLAGS_tsc.o          := $(nostackp)
 +CFLAGS_paravirt.o     := $(nostackp)
  
- obj-y                 := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
- obj-y                 += traps.o irq_$(BITS).o dumpstack_$(BITS).o
- obj-y                 += time_$(BITS).o ioport.o ldt.o
+ obj-y                 := process_$(BITS).o signal.o entry_$(BITS).o
+ obj-y                 += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
+ obj-y                 += time_$(BITS).o ioport.o ldt.o dumpstack.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

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/mm/fault.c
index d18ea136d8a67567aabf8a0a9434ab0976fb2e89,57ec8c86a8776700729f682fc8a9b60b6a3482cd..4c056b5d6a956712691748f31b5bbbae4f4b8800
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -589,10 -589,9 +590,11 @@@ void __kprobes do_page_fault(struct pt_
        unsigned long address;
        int write, si_code;
        int fault;
 +      unsigned long *stackend;
 +
  #ifdef CONFIG_X86_64
        unsigned long flags;
+       int sig;
  #endif
  
        tsk = current;

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

diff --cc init/main.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
index 99c5c655b098659ce4e410d77e58765b2d0d1075,43cbf30669e6de76d4bc315864489deab3336eff..913284e3db14e7bb435d0c677a2dad809c5e68cb
--- 1/kernel/fork.c
--- 2/kernel/fork.c
+++ b/kernel/fork.c
@@@ -58,7 -60,7 +60,8 @@@
  #include <linux/tty.h>
  #include <linux/proc_fs.h>
  #include <linux/blkdev.h>
+ #include <trace/sched.h>
 +#include <linux/magic.h>
  
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>

diff --cc kernel/panic.c
index e0a87bb025c00e4e0591db1c1f6b337c0f080a56,13f06349a7868aa2ad79635266b94050eb932545..3a0b0898690a5bfc4845f03cac29d24c9461d748
--- 1/kernel/panic.c
--- 2/kernel/panic.c
+++ b/kernel/panic.c
@@@ -357,9 -359,10 +367,12 @@@ EXPORT_SYMBOL(warn_slowpath)
   */
  void __stack_chk_fail(void)
  {
 -      panic("stack-protector: Kernel stack is corrupted");
 +      panic("stack-protector: Kernel stack is corrupted in: %p\n",
 +              __builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
 +
  #endif
+ 
+ core_param(panic, panic_timeout, int, 0644);
+ core_param(pause_on_oops, pause_on_oops, int, 0644);

diff --cc kernel/sched.c
Simple merge