diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 09:22:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 09:22:24 -0700 |
| commit | 32527bc0e4b4fa7711ad1c923cf64ae72a7ffd9d (patch) | |
| tree | 397c7ea179ebd3d2dacc0a2c8b165f8840137045 /arch/s390 | |
| parent | e14a685dfabf3ceeb366f1db1a22471b8f98a08b (diff) | |
| parent | 99f6a570eedc885675b6aa36b7acdbdcc3a7f55b (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] cio: online_store - trigger recognition for boxed devices
[S390] cio: disallow online setting of device in transient state
[S390] cio: introduce notifier for boxed state
[S390] cio: introduce ccw_device_schedule_sch_unregister
[S390] cio: wake up on failed recognition
[S390] fix hypfs build failure
[PATCH] sysrq: include interrupt.h instead of irq.h
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/hypfs/hypfs_diag.c | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/cio.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index b1e892a4381..704dd396257 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c @@ -12,6 +12,8 @@ #include <linux/types.h> #include <linux/errno.h> +#include <linux/gfp.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/vmalloc.h> #include <asm/ebcdic.h> diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index 6dccb071aec..619bf94b11f 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h @@ -456,6 +456,8 @@ struct ciw { #define CIO_OPER 0x0004 /* Sick revalidation of device. */ #define CIO_REVALIDATE 0x0008 +/* Device did not respond in time. */ +#define CIO_BOXED 0x0010 /** * struct ccw_dev_id - unique identifier for ccw devices |