diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-08-17 15:47:01 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-08-17 15:47:01 +0300 |
| commit | dce2e5c543cdb828cebe53bb6b5712c98ee82f2c (patch) | |
| tree | 8e831e9690cd424903413b104b1b0cbe101668e1 | |
| parent | 8e365e3339d5f8bc77297a7bceb8fcae2f338367 (diff) | |
debian/patches: refresh version.patch for 4.8-rc2
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
| -rw-r--r-- | debian/patches/debian/version.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch index da54a6900..2bb55689c 100644 --- a/debian/patches/debian/version.patch +++ b/debian/patches/debian/version.patch @@ -9,16 +9,16 @@ are set. --- a/Makefile +++ b/Makefile -@@ -980,7 +980,7 @@ endif - prepare2: prepare3 outputmakefile asm-generic +@@ -1004,7 +1004,7 @@ endif + prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic prepare1: prepare2 $(version_h) include/generated/utsrelease.h \ - include/config/auto.conf + include/config/auto.conf include/generated/package.h $(cmd_crmodverdir) - - archprepare: archheaders archscripts prepare1 scripts_basic -@@ -1012,6 +1012,16 @@ define filechk_version.h + $(Q)test -e include/generated/autoksyms.h || \ + touch include/generated/autoksyms.h +@@ -1079,6 +1079,16 @@ define filechk_version.h echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';) endef @@ -35,7 +35,7 @@ are set. $(version_h): $(srctree)/Makefile FORCE $(call filechk,version.h) $(Q)rm -f $(old_version_h) -@@ -1019,6 +1029,9 @@ $(version_h): $(srctree)/Makefile FORCE +@@ -1086,6 +1096,9 @@ $(version_h): $(srctree)/Makefile FORCE include/generated/utsrelease.h: include/config/kernel.release FORCE $(call filechk,utsrelease.h) @@ -91,15 +91,15 @@ are set. regs->ar_unat, regs->ar_pfs, regs->ar_rsc); --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c -@@ -38,6 +38,7 @@ - #include <linux/random.h> +@@ -39,6 +39,7 @@ #include <linux/hw_breakpoint.h> #include <linux/uaccess.h> + #include <linux/elf-randomize.h> +#include <generated/package.h> #include <asm/pgtable.h> #include <asm/io.h> -@@ -1001,8 +1002,9 @@ void show_regs(struct pt_regs * regs) +@@ -1309,8 +1310,9 @@ void show_regs(struct pt_regs * regs) printk("NIP: "REG" LR: "REG" CTR: "REG"\n", regs->nip, regs->link, regs->ctr); @@ -109,19 +109,19 @@ are set. + regs, regs->trap, print_tainted(), init_utsname()->release, + LINUX_PACKAGE_ID); printk("MSR: "REG" ", regs->msr); - printbits(regs->msr, msr_bits); + print_msr_bits(regs->msr); printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -46,6 +46,7 @@ +@@ -45,6 +45,7 @@ #include <linux/utsname.h> #include <linux/ctype.h> #include <linux/uio.h> +#include <generated/package.h> #include <asm/uaccess.h> - -@@ -3036,11 +3037,12 @@ void __init dump_stack_set_arch_desc(con + #include <asm/sections.h> +@@ -3291,11 +3292,12 @@ void __init dump_stack_set_arch_desc(con */ void dump_stack_print_info(const char *log_lvl) { |