aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-09-16 00:48:32 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-09-16 00:48:32 -0400
commitea88023b3491a384575ebcd5e8a449e841a28a24 (patch)
treef46e3d8302e44dc55ce31823501e100472d29683 /arch/sh
parenta6f15ade97989d414e9bf33874c9d5d1f39808ec (diff)
parent0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/sh_eth.h3
-rw-r--r--arch/sh/kernel/signal_32.c2
-rw-r--r--arch/sh/kernel/signal_64.c2
-rw-r--r--arch/sh/kernel/vmlinux.lds.S12
4 files changed, 9 insertions, 10 deletions
diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h
index bb832584f3c1..acf99700deed 100644
--- a/arch/sh/include/asm/sh_eth.h
+++ b/arch/sh/include/asm/sh_eth.h
@@ -6,6 +6,9 @@ enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
6struct sh_eth_plat_data { 6struct sh_eth_plat_data {
7 int phy; 7 int phy;
8 int edmac_endian; 8 int edmac_endian;
9
10 unsigned no_ether_link:1;
11 unsigned ether_link_active_low:1;
9}; 12};
10 13
11#endif 14#endif
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 6010750c90b4..6729703547a1 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -650,5 +650,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
650 if (thread_info_flags & _TIF_NOTIFY_RESUME) { 650 if (thread_info_flags & _TIF_NOTIFY_RESUME) {
651 clear_thread_flag(TIF_NOTIFY_RESUME); 651 clear_thread_flag(TIF_NOTIFY_RESUME);
652 tracehook_notify_resume(regs); 652 tracehook_notify_resume(regs);
653 if (current->replacement_session_keyring)
654 key_replace_session_keyring();
653 } 655 }
654} 656}
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 026fd1cfe17d..74793c80a57a 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -760,5 +760,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info
760 if (thread_info_flags & _TIF_NOTIFY_RESUME) { 760 if (thread_info_flags & _TIF_NOTIFY_RESUME) {
761 clear_thread_flag(TIF_NOTIFY_RESUME); 761 clear_thread_flag(TIF_NOTIFY_RESUME);
762 tracehook_notify_resume(regs); 762 tracehook_notify_resume(regs);
763 if (current->replacement_session_keyring)
764 key_replace_session_keyring();
763 } 765 }
764} 766}
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 1b7d9d541e01..a1e4ec24f1f5 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -99,16 +99,8 @@ SECTIONS
99 _ebss = .; /* uClinux MTD sucks */ 99 _ebss = .; /* uClinux MTD sucks */
100 _end = . ; 100 _end = . ;
101 101
102 /*
103 * When something in the kernel is NOT compiled as a module, the
104 * module cleanup code and data are put into these segments. Both
105 * can then be thrown away, as cleanup code is never called unless
106 * it's a module.
107 */
108 /DISCARD/ : {
109 EXIT_CALL
110 }
111
112 STABS_DEBUG 102 STABS_DEBUG
113 DWARF_DEBUG 103 DWARF_DEBUG
104
105 DISCARDS
114} 106}