Commit 3bd82263 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents eef70b21 f9d62c00

arch/sh/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ config GENERIC_HARDIRQS 


config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y

	depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \

				!SH_7751_SYSTEMH && !HD64461)



config GENERIC_IRQ_PROBE

	def_bool y

drivers/sh/maple/maple.c

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ static int __init maple_bus_init(void) 


	maple_queue_cache =

	    kmem_cache_create("maple_queue_cache", 0x400, 0,

			      SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);

			      SLAB_HWCACHE_ALIGN, NULL);



	if (!maple_queue_cache)

		goto cleanup_bothirqs;