[kernel] r22349 - dists/trunk/linux/debian/patches/debian

[Maximilian Attems]

Author: maks
Date: Sun Feb  8 12:26:35 2015
New Revision: 22349

Log:
version.patch : fixup

Signed-off-by: maximilian attems <maks at debian.org>

Modified:
   dists/trunk/linux/debian/patches/debian/version.patch

Modified: dists/trunk/linux/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/version.patch	Sun Feb  8 12:26:33 2015	(r22348)
+++ dists/trunk/linux/debian/patches/debian/version.patch	Sun Feb  8 12:26:35 2015	(r22349)
@@ -9,7 +9,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -963,7 +963,7 @@ endif
+@@ -973,7 +973,7 @@ endif
  prepare2: prepare3 outputmakefile asm-generic
  
  prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
@@ -18,7 +18,7 @@
  	$(cmd_crmodverdir)
  
  archprepare: archheaders archscripts prepare1 scripts_basic
-@@ -995,12 +995,25 @@ define filechk_version.h
+@@ -1005,13 +1005,26 @@ define filechk_version.h
  	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
  endef
  
@@ -34,6 +34,7 @@
 +
  $(version_h): $(srctree)/Makefile FORCE
  	$(call filechk,version.h)
+ 	$(Q)rm -f $(old_version_h)
  
  include/generated/utsrelease.h: include/config/kernel.release FORCE
  	$(call filechk,utsrelease.h)
@@ -90,15 +91,15 @@
  	       regs->ar_unat, regs->ar_pfs, regs->ar_rsc);
 --- a/arch/powerpc/kernel/process.c
 +++ b/arch/powerpc/kernel/process.c
-@@ -37,6 +37,7 @@
- #include <linux/personality.h>
+@@ -38,6 +38,7 @@
  #include <linux/random.h>
  #include <linux/hw_breakpoint.h>
+ #include <linux/uaccess.h>
 +#include <generated/package.h>
  
  #include <asm/pgtable.h>
- #include <asm/uaccess.h>
-@@ -1004,8 +1005,9 @@ void show_regs(struct pt_regs * regs)
+ #include <asm/io.h>
+@@ -1001,8 +1002,9 @@ void show_regs(struct pt_regs * regs)
  
  	printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
  	       regs->nip, regs->link, regs->ctr);