diff options
author | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
---|---|---|
committer | Paul Mackerras | 2008-05-23 08:53:23 +0200 |
commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /arch/arm/kernel | |
parent | [POWERPC] Remove unnecessary cast in arch_deref_entry_point() (diff) | |
parent | [POWERPC] iSeries: Remove unused mail address (diff) | |
download | kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.xz kernel-qcow2-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/armksyms.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/arthur.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/init_task.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index f73d62e8ab60..688b7b1ee416 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -179,3 +179,5 @@ EXPORT_SYMBOL(_find_next_zero_bit_be); EXPORT_SYMBOL(_find_first_bit_be); EXPORT_SYMBOL(_find_next_bit_be); #endif + +EXPORT_SYMBOL(copy_page); diff --git a/arch/arm/kernel/arthur.c b/arch/arm/kernel/arthur.c index 0ee2e9819631..321c5291d05f 100644 --- a/arch/arm/kernel/arthur.c +++ b/arch/arm/kernel/arthur.c @@ -90,3 +90,5 @@ static void __exit arthur_exit(void) module_init(arthur_init); module_exit(arthur_exit); + +MODULE_LICENSE("GPL"); diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c index bd4ef53bc6b9..8b8c9d38a761 100644 --- a/arch/arm/kernel/init_task.c +++ b/arch/arm/kernel/init_task.c @@ -13,7 +13,6 @@ #include <asm/pgtable.h> static struct fs_struct init_fs = INIT_FS; -static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); struct mm_struct init_mm = INIT_MM(init_mm); |