diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:57:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:57:44 -0800 |
| commit | ebaf0c6032f525ddb0158fb59848d41899dce8cd (patch) | |
| tree | c6c19d30f3621725f61941d1de967c4351fb22f7 /include | |
| parent | [PATCH] Mark struct super_operations const (diff) | |
| parent | [S390] remove __io_virt and mmiowb. (diff) | |
| download | linux-dev-ebaf0c6032f525ddb0158fb59848d41899dce8cd.tar.xz linux-dev-ebaf0c6032f525ddb0158fb59848d41899dce8cd.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] remove __io_virt and mmiowb.
[S390] cio: use ARRAY_SIZE in device_id.c
[S390] cio: Fixup interface for setting options on ccw devices.
[S390] smp_call_function/smp_call_function_on locking.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/ccwdev.h | 2 | ||||
| -rw-r--r-- | include/asm-s390/io.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h index 58c70acffc73..cfc81533b9ba 100644 --- a/include/asm-s390/ccwdev.h +++ b/include/asm-s390/ccwdev.h @@ -110,7 +110,9 @@ extern void ccw_driver_unregister (struct ccw_driver *driver); struct ccw1; +extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long); extern int ccw_device_set_options(struct ccw_device *, unsigned long); +extern void ccw_device_clear_options(struct ccw_device *, unsigned long); /* Allow for i/o completion notification after primary interrupt status. */ #define CCWDEV_EARLY_NOTIFICATION 0x0001 diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h index dca6a6cc103f..b7ff6afc3caa 100644 --- a/include/asm-s390/io.h +++ b/include/asm-s390/io.h @@ -17,8 +17,6 @@ #define IO_SPACE_LIMIT 0xffffffff -#define __io_virt(x) ((void *)(PAGE_OFFSET | (unsigned long)(x))) - /* * Change virtual addresses to physical addresses and vv. * These are pretty trivial @@ -37,11 +35,9 @@ static inline unsigned long virt_to_phys(volatile void * address) static inline void * phys_to_virt(unsigned long address) { - return __io_virt(address); + return (void *) address; } -#define mmiowb() do { } while (0) - /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access |