diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2007-11-14 20:00:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:45 -0500 |
commit | 7b275523aba522aa76891861ee32ba2456e5f146 (patch) | |
tree | 6b5fa5c7916af2d91b81ca1eec3352a63eabe3ab /arch/cris/Kconfig | |
parent | 633edf5a4fff0675851e377cc5f0c9072683a5f4 (diff) |
cris build fixes: corrected and improved NMI and IRQ handling
Corrects compile errors and the following:
- Remove oldset parameter from do_signal and do_notify_resume.
- Modified to fit new consolidated IRQ handling code.
- Reverse check order between external nmi and watchdog nmi to avoid false
watchdog oops in case of a glitch on the nmi pin.
- Return from an pin-generated NMI the same way as for other interrupts.
- Moved blocking of ethernet rx/tx irq from ethernet interrupt handler to
low-level asm interrupt handlers. Fixed in the multiple interrupt
handler also.
- Add space for thread local storage in thread_info struct.
- Add NO_DMA to Kconfig, and include arch specific Kconfig using arch
independent path. Include subsystem Kconfigs for pcmcia, usb, i2c,
rtc and pci.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r-- | arch/cris/Kconfig | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index f653772a87a8..222da1501f47 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -13,6 +13,10 @@ config ZONE_DMA | |||
13 | bool | 13 | bool |
14 | default y | 14 | default y |
15 | 15 | ||
16 | config NO_DMA | ||
17 | bool | ||
18 | default y | ||
19 | |||
16 | config RWSEM_GENERIC_SPINLOCK | 20 | config RWSEM_GENERIC_SPINLOCK |
17 | bool | 21 | bool |
18 | default y | 22 | default y |
@@ -153,7 +157,8 @@ source "net/Kconfig" | |||
153 | 157 | ||
154 | # bring in ETRAX built-in drivers | 158 | # bring in ETRAX built-in drivers |
155 | menu "Drivers for built-in interfaces" | 159 | menu "Drivers for built-in interfaces" |
156 | source arch/cris/arch-v10/drivers/Kconfig | 160 | # arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32) |
161 | source arch/cris/arch/drivers/Kconfig | ||
157 | 162 | ||
158 | endmenu | 163 | endmenu |
159 | 164 | ||
@@ -184,6 +189,10 @@ source "drivers/isdn/Kconfig" | |||
184 | 189 | ||
185 | source "drivers/telephony/Kconfig" | 190 | source "drivers/telephony/Kconfig" |
186 | 191 | ||
192 | source "drivers/i2c/Kconfig" | ||
193 | |||
194 | source "drivers/rtc/Kconfig" | ||
195 | |||
187 | # | 196 | # |
188 | # input before char - char/joystick depends on it. As does USB. | 197 | # input before char - char/joystick depends on it. As does USB. |
189 | # | 198 | # |
@@ -198,6 +207,10 @@ source "fs/Kconfig" | |||
198 | 207 | ||
199 | source "sound/Kconfig" | 208 | source "sound/Kconfig" |
200 | 209 | ||
210 | source "drivers/pcmcia/Kconfig" | ||
211 | |||
212 | source "drivers/pci/Kconfig" | ||
213 | |||
201 | source "drivers/usb/Kconfig" | 214 | source "drivers/usb/Kconfig" |
202 | 215 | ||
203 | source "kernel/Kconfig.instrumentation" | 216 | source "kernel/Kconfig.instrumentation" |