diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
tree | 29932718192962671c48c3fd1ea017a6112459e8 /arch/um/kernel | |
parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/init_task.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/ksyms.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index dcfceca95052..910eda8fca18 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
14 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
15 | static struct files_struct init_files = INIT_FILES; | ||
16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
18 | EXPORT_SYMBOL(init_mm); | 17 | EXPORT_SYMBOL(init_mm); |
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 66e2a305a8d6..ccc02a616c22 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
@@ -60,6 +60,11 @@ EXPORT_SYMBOL(os_rcv_fd); | |||
60 | EXPORT_SYMBOL(run_helper); | 60 | EXPORT_SYMBOL(run_helper); |
61 | EXPORT_SYMBOL(start_thread); | 61 | EXPORT_SYMBOL(start_thread); |
62 | 62 | ||
63 | EXPORT_SYMBOL(add_sigio_fd); | ||
64 | EXPORT_SYMBOL(ignore_sigio_fd); | ||
65 | EXPORT_SYMBOL(deactivate_fd); | ||
66 | EXPORT_SYMBOL(sigio_broken); | ||
67 | |||
63 | #ifdef CONFIG_SMP | 68 | #ifdef CONFIG_SMP |
64 | 69 | ||
65 | /* required for SMP */ | 70 | /* required for SMP */ |