diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cciss_ioctl.h | 5 | ||||
| -rw-r--r-- | include/linux/init.h | 32 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
3 files changed, 9 insertions, 29 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index 54e513cf7a23..2f7e00b5b581 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h @@ -184,6 +184,11 @@ typedef struct _IOCTL_Command_struct { #define CCISS_GETDRIVVER _IOR(CCISS_IOC_MAGIC, 9, DriverVer_type) #define CCISS_REVALIDVOLS _IO(CCISS_IOC_MAGIC, 10) #define CCISS_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 11, IOCTL_Command_struct) +#define CCISS_DEREGDISK _IO(CCISS_IOC_MAGIC, 12) +/* no longer used... use REGNEWD instead */ +#define CCISS_REGNEWDISK _IOW(CCISS_IOC_MAGIC, 13, int) + +#define CCISS_REGNEWD _IO(CCISS_IOC_MAGIC, 14) #endif diff --git a/include/linux/init.h b/include/linux/init.h index 0a9c2eba880e..f0644ca302e8 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -50,26 +50,8 @@ typedef void (*exitcall_t)(void); extern initcall_t __initcall_start, __initcall_end; -/* initcalls are now grouped by functionality into separate - * subsections. Ordering inside the subsections is determined - * by link order. - * For backwards compatability, initcall() puts the call in - * the device init subsection. - */ - -#define __define_initcall(level,fn) \ - static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn - -#define early_arch_initcall(fn) __define_initcall("1",fn) -#define mem_initcall(fn) __define_initcall("2",fn) -#define subsys_initcall(fn) __define_initcall("3",fn) -#define arch_initcall(fn) __define_initcall("4",fn) -#define fs_initcall(fn) __define_initcall("5",fn) -#define device_initcall(fn) __define_initcall("6",fn) -#define late_initcall(fn) __define_initcall("7",fn) - -#define __initcall(fn) device_initcall(fn) - +#define __initcall(fn) \ + static initcall_t __initcall_##fn __init_call = fn #define __exitcall(fn) \ static exitcall_t __exitcall_##fn __exit_call = fn @@ -98,7 +80,7 @@ extern struct kernel_param __setup_start, __setup_end; #define __initdata __attribute__ ((__section__ (".data.init"))) #define __exitdata __attribute__ ((unused, __section__ (".data.exit"))) #define __initsetup __attribute__ ((unused,__section__ (".setup.init"))) -#define __init_call(level) __attribute__ ((unused,__section__ (".initcall" level ".init"))) +#define __init_call __attribute__ ((unused,__section__ (".initcall.init"))) #define __exit_call __attribute__ ((unused,__section__ (".exitcall.exit"))) /* For assembly routines */ @@ -159,14 +141,6 @@ typedef void (*__cleanup_module_func_t)(void); #define __setup(str,func) /* nothing */ -#define early_arch_initcall(fn) module_init(fn) -#define mem_initcall(fn) module_init(fn) -#define subsys_initcall(fn) module_init(fn) -#define arch_initcall(fn) module_init(fn) -#define fs_initcall(fn) module_init(fn) -#define device_initcall(fn) module_init(fn) -#define late_initcall(fn) module_init(fn) - #endif #ifdef CONFIG_HOTPLUG diff --git a/include/linux/pci.h b/include/linux/pci.h index 7660a0bf8e9b..4971fa3c3586 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -525,6 +525,7 @@ int pcibios_find_device (unsigned short vendor, unsigned short dev_id, /* Generic PCI functions used internally */ +void pci_init(void); int pci_bus_exists(const struct list_head *list, int nr); struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_alloc_primary_bus(int bus); |