From: Greg Kroah-Hartman Date: Tue, 7 Jan 2014 01:00:00 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.76~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9bbb720892e4340922fbf7f6f7c6eb10bfd51f9;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-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.12/series b/queue-3.12/series index 6255324e46b..0b9f3b1922b 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -143,3 +143,4 @@ aio-migratepages-make-aio-migrate-pages-sane.patch nouveau_acpi-convert-acpi_get_handle-to-acpi_has_method.patch acpiphp-radeon-nouveau-fix-vga-switcheroo-problem-related-to-hotplug.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.12/sh-add-export_symbol-min_low_pfn-and-export_symbol-max_low_pfn-to-sh_ksyms_32.c.patch b/queue-3.12/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.12/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)