The patch titled
FRV: Fix FRV arch compile errors
has been removed from the -mm tree. Its filename is
frv-fix-frv-arch-compile-errors.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: FRV: Fix FRV arch compile errors
From: David Howells <dhowells@xxxxxxxxxx>
Fix some FRV arch compile errors, including:
- Mark nr_kernel_pages as __initdata so that references to it end up being
properly calculated rather than being assumed to be in the small data
section (and thus calculated wrt the GP register). Not doing this causes
the linker to emit errors as the offset is too big to fit into the load
instruction.
- Move pm_power_off into an unconditionally compiled .c file as it's now
unconditionally accessed.
- Declare frv_change_cmode() in a header file rather than in a .c file, and
declare it asmlinkage.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/frv/kernel/local.h | 3 +++
arch/frv/kernel/pm.c | 5 -----
arch/frv/kernel/process.c | 4 ++++
include/linux/bootmem.h | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff -puN arch/frv/kernel/local.h~frv-fix-frv-arch-compile-errors arch/frv/kernel/local.h
--- a/arch/frv/kernel/local.h~frv-fix-frv-arch-compile-errors
+++ a/arch/frv/kernel/local.h
@@ -51,6 +51,9 @@ extern void (*__power_switch_wake_cleanu
/* time.c */
extern void time_divisor_init(void);
+/* cmode.S */
+extern asmlinkage void frv_change_cmode(int);
+
#endif /* __ASSEMBLY__ */
#endif /* _FRV_LOCAL_H */
diff -puN arch/frv/kernel/pm.c~frv-fix-frv-arch-compile-errors arch/frv/kernel/pm.c
--- a/arch/frv/kernel/pm.c~frv-fix-frv-arch-compile-errors
+++ a/arch/frv/kernel/pm.c
@@ -26,11 +26,6 @@
#include "local.h"
-void (*pm_power_off)(void);
-EXPORT_SYMBOL(pm_power_off);
-
-extern void frv_change_cmode(int);
-
/*
* Debug macros
*/
diff -puN arch/frv/kernel/process.c~frv-fix-frv-arch-compile-errors arch/frv/kernel/process.c
--- a/arch/frv/kernel/process.c~frv-fix-frv-arch-compile-errors
+++ a/arch/frv/kernel/process.c
@@ -10,6 +10,7 @@
* 2 of the License, or (at your option) any later version.
*/
+#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -38,6 +39,9 @@ asmlinkage void ret_from_fork(void);
#include <asm/pgalloc.h>
+void (*pm_power_off)(void);
+EXPORT_SYMBOL(pm_power_off);
+
struct task_struct *alloc_task_struct(void)
{
struct task_struct *p = kmalloc(THREAD_SIZE, GFP_KERNEL);
diff -puN include/linux/bootmem.h~frv-fix-frv-arch-compile-errors include/linux/bootmem.h
--- a/include/linux/bootmem.h~frv-fix-frv-arch-compile-errors
+++ a/include/linux/bootmem.h
@@ -107,7 +107,7 @@ static inline void *alloc_remap(int nid,
}
#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
-extern unsigned long nr_kernel_pages;
+extern unsigned long __initdata nr_kernel_pages;
extern unsigned long nr_all_pages;
extern void *alloc_large_system_hash(const char *tablename,
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
lockdep-add-more-rwsemh-documentation.patch
vfs-documentation-tweak.patch
git-gfs2.patch
frv-fix-frv-arch-compile-errors.patch
nommu-fix-execution-off-of-ramfs-with-mmap.patch
frv-introduce-asm-offsets-for-frv-arch.patch
ecryptfs-get_sb_dev-fix.patch
reiser4-get_sb_dev-fix.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
