diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 16:13:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 16:13:46 -0700 |
| commit | e00eea42f24550beb9940e641402450f695c888a (patch) | |
| tree | 2a83ae36db1d1bf0dd8b8be46e41f17b9dd459b5 /arch | |
| parent | bc90ba093af2e5022b9d055a2148b54a6aa35bc9 (diff) | |
| parent | 093d0faf57e59feee224217273f944e10e4e3562 (diff) | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Define ARCH_KMALLOC_MINALIGN to L1_CACHE_BYTES
[AVR32] STK1000: Set SPI_MODE_3 in the ltv350qv board info
[AVR32] gpio_*_cansleep() fix
[AVR32] ratelimit segfault reporting rate
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 1 | ||||
| -rw-r--r-- | arch/avr32/mm/fault.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index fe1dbe2e28f..e253e86a1a3 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -42,6 +42,7 @@ static struct spi_board_info spi0_board_info[] __initdata = { .modalias = "ltv350qv", .max_speed_hz = 16000000, .chip_select = 1, + .mode = SPI_MODE_3, }, }; diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index e011f1ce187..4b2495285d9 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -158,7 +158,7 @@ bad_area: up_read(&mm->mmap_sem); if (user_mode(regs)) { - if (exception_trace) + if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", is_init(tsk) ? KERN_EMERG : KERN_INFO, |