]> err.no Git - linux-2.6/commitdiff
[S390] lowcore: Change type of lowcores softirq_pending to __u32.
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Thu, 17 Apr 2008 05:46:29 +0000 (07:46 +0200)
committerHeiko Carstens <heiko.carstens@de.ibm.com>
Thu, 17 Apr 2008 05:47:07 +0000 (07:47 +0200)
As noted by akpm:

> kernel/time/tick-sched.c: In function 'tick_nohz_stop_sched_tick':
> kernel/time/tick-sched.c:229: warning: format '%02x' expects type 'unsigned int', but argument 2 has type '__u64'
>
> I don't think the architecture's local_softirq_pending() should return u64.
> This is the sort of thing which should be consistent across architectures.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
include/asm-s390/lowcore.h

index 6baa51b8683ba50940b39132936530ffc1eb689d..007c8a4941b2e49710c7f11e158fc3477c41d94c 100644 (file)
@@ -370,7 +370,8 @@ struct _lowcore
        __u64        ext_call_fast;            /* 0xdc8 */
        __u64        percpu_offset;            /* 0xdd0 */
        __u64        current_task;             /* 0xdd8 */
-       __u64        softirq_pending;          /* 0xde0 */
+       __u32        softirq_pending;          /* 0xde0 */
+       __u32        pad_0x0de4;               /* 0xde4 */
        __u64        int_clock;                /* 0xde8 */
         __u8         pad12[0xe00-0xdf0];       /* 0xdf0 */