From: Greg Kroah-Hartman Date: Tue, 7 Jan 2014 00:59:56 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.4.76~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c74f9606d3c090a72947b471bfcfbc47fb5d8e6d;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch --- diff --git a/queue-3.10/series b/queue-3.10/series index af7658582de..3185565892d 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -128,3 +128,4 @@ arm64-avoid-cache-flushing-in-flush_dcache_page.patch arm64-do-not-flush-the-d-cache-for-anonymous-pages.patch arm64-use-normal-noncacheable-memory-for-writecombine.patch ext4-fix-bigalloc-regression.patch +sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch diff --git a/queue-3.10/sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch b/queue-3.10/sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch new file mode 100644 index 00000000000..e7f9cf254ca --- /dev/null +++ b/queue-3.10/sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch @@ -0,0 +1,47 @@ +From ad70b029d2c678386384bd72c7fa2705c449b518 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Thu, 2 Jan 2014 12:58:53 -0800 +Subject: sh: add EXPORT_SYMBOL(min_low_pfn) and EXPORT_SYMBOL(max_low_pfn) to sh_ksyms_32.c + +From: Nobuhiro Iwamatsu + +commit ad70b029d2c678386384bd72c7fa2705c449b518 upstream. + +Min_low_pfn and max_low_pfn were used in pfn_valid macro if defined +CONFIG_FLATMEM. When the functions that use the pfn_valid is used in +driver module, max_low_pfn and min_low_pfn is to undefined, and fail to +build. + + ERROR: "min_low_pfn" [drivers/block/aoe/aoe.ko] undefined! + ERROR: "max_low_pfn" [drivers/block/aoe/aoe.ko] undefined! + make[2]: *** [__modpost] Error 1 + make[1]: *** [modules] Error 2 + +This patch fix this problem. + +Signed-off-by: Nobuhiro Iwamatsu +Cc: Kuninori Morimoto +Cc: Paul Mundt +Cc: Geert Uytterhoeven +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/sh/kernel/sh_ksyms_32.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/arch/sh/kernel/sh_ksyms_32.c ++++ b/arch/sh/kernel/sh_ksyms_32.c +@@ -20,6 +20,11 @@ EXPORT_SYMBOL(csum_partial_copy_generic) + EXPORT_SYMBOL(copy_page); + EXPORT_SYMBOL(__clear_user); + EXPORT_SYMBOL(empty_zero_page); ++#ifdef CONFIG_FLATMEM ++/* need in pfn_valid macro */ ++EXPORT_SYMBOL(min_low_pfn); ++EXPORT_SYMBOL(max_low_pfn); ++#endif + + #define DECLARE_EXPORT(name) \ + extern void name(void);EXPORT_SYMBOL(name)