tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted platforms.
sh: maple: Do not pass SLAB_POISON to kmem_cache_create()

Linus Torvalds 3bd82263 eef70b21

+3 -1
+2
arch/sh/Kconfig
··· 55 55 56 56 config GENERIC_HARDIRQS_NO__DO_IRQ 57 57 def_bool y 58 + depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \ 59 + !SH_7751_SYSTEMH && !HD64461) 58 60 59 61 config GENERIC_IRQ_PROBE 60 62 def_bool y
+1 -1
drivers/sh/maple/maple.c
··· 827 827 828 828 maple_queue_cache = 829 829 kmem_cache_create("maple_queue_cache", 0x400, 0, 830 - SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL); 830 + SLAB_HWCACHE_ALIGN, NULL); 831 831 832 832 if (!maple_queue_cache) 833 833 goto cleanup_bothirqs;