diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 22:23:20 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 22:23:20 +0400 |
| commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
| tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /include/linux/ioport.h | |
| parent | d84705969f898f294bc3fc32eca33580f14105bd (diff) | |
| parent | 43603c8df97f246e8be7b9cc92a8f968a85108bd (diff) | |
| download | linux-0afe2db21394820d32646a695eccf3fbfe6ab5c7.tar.xz | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/linux/ioport.h')
| -rw-r--r-- | include/linux/ioport.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 350033e8f4e1..ee9bcc6f32b6 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -108,6 +108,9 @@ extern struct resource iomem_resource; extern int request_resource(struct resource *root, struct resource *new); extern int release_resource(struct resource *new); +extern void reserve_region_with_split(struct resource *root, + resource_size_t start, resource_size_t end, + const char *name); extern int insert_resource(struct resource *parent, struct resource *new); extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new); extern int allocate_resource(struct resource *root, struct resource *new, |