Subject: Re: [PATCH] sysrq: include interrupt.h instead of irq.h

From: Mike Travis <[email-masked]>
Date: Mon, 26 Jan 2009 07:00:29 -0800

Hi Ingo,

Here's Heiko's patch in my 'urgent-for-ingo' branch. 

Thanks,
Mike

The following changes since commit c3c467d0aabdbb53863e8722be898770d438c140:
  Ingo Molnar (1):
        fix: crash: IP: __bitmap_intersects+0x48/0x73

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git urgent-for-ingo

Heiko Carstens (1):
      sysrq: include interrupt.h instead of irq.h

 drivers/char/sysrq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Heiko Carstens wrote:
> On Wed, 21 Jan 2009 08:50:03 -0800
> Mike Travis <[email-masked]> wrote:
> 
>> Thanks for catching this Heiko!
>> Mike
> 
> Erm... it still breaks. Are you going to add the patch to your tree?
> 
>> Heiko Carstens wrote:
>>> From: Heiko Carstens <[email-masked]>
>>>
>>> With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
>>> we get this compile bug on s390:
>>>
>>>   CC      drivers/char/sysrq.o
>>> In file included from drivers/char/sysrq.c:38:
>>> include/linux/irq.h: In function 'init_alloc_desc_masks':
>>> include/linux/irq.h:442: error: dereferencing pointer to incomplete type
>>>
>>> drivers/char/sysrq.c should include interrupt.h instead of irq.h.
>>>
>>> Cc: Mike Travis <[email-masked]>
>>> Cc: Martin Schwidefsky <[email-masked]>
>>> Signed-off-by: Heiko Carstens <[email-masked]>
>>> ---
>>>  drivers/char/sysrq.c |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> Index: linux-next/drivers/char/sysrq.c
>>> ===================================================================
>>> --- linux-next.orig/drivers/char/sysrq.c
>>> +++ linux-next/drivers/char/sysrq.c
>>> @@ -35,7 +35,7 @@
>>>  #include <linux/vt_kern.h>
>>>  #include <linux/workqueue.h>
>>>  #include <linux/kexec.h>
>>> -#include <linux/irq.h>
>>> +#include <linux/interrupt.h>
>>>  #include <linux/hrtimer.h>
>>>  #include <linux/oom.h>