diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 12:54:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 12:54:45 -0400 |
| commit | e7f2f9918c0e97aa98ba147ca387e2c7238f0711 (patch) | |
| tree | dd85d6d2907bffeda76b42ce55a445e3142fe738 /include/asm-x86/io_64.h | |
| parent | 11a96d1820113fde0d55c3487b7da7a9031326b8 (diff) | |
| parent | c00193f9f09f9b852249a66391985f585d066084 (diff) | |
Merge phase #5 (misc) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Merges oprofile, timers/hpet, x86/traps, x86/time, and x86/core misc items.
* 'x86-core-v4-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (132 commits)
x86: change early_ioremap to use slots instead of nesting
x86: adjust dependencies for CONFIG_X86_CMOV
dumpstack: x86: various small unification steps, fix
x86: remove additional_cpus
x86: remove additional_cpus configurability
x86: improve UP kernel when CPU-hotplug and SMP is enabled
dumpstack: x86: various small unification steps
dumpstack: i386: make kstack= an early boot-param and add oops=panic
dumpstack: x86: use log_lvl and unify trace formatting
dumptrace: x86: consistently include loglevel, print stack switch
dumpstack: x86: add "end" parameter to valid_stack_ptr and print_context_stack
dumpstack: x86: make printk_address equal
dumpstack: x86: move die_nmi to dumpstack_32.c
traps: x86: finalize unification of traps.c
traps: x86: make traps_32.c and traps_64.c equal
traps: x86: various noop-changes preparing for unification of traps_xx.c
traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
traps: i386: expand clear_mem_error and remove from mach_traps.h
traps: x86_64: make io_check_error equal to the one on i386
traps: i386: use preempt_conditional_sti/cli in do_int3
...
Diffstat (limited to 'include/asm-x86/io_64.h')
| -rw-r--r-- | include/asm-x86/io_64.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index 64429e9431a8..ee6e086b7dfe 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h | |||
| @@ -165,9 +165,6 @@ static inline void *phys_to_virt(unsigned long address) | |||
| 165 | 165 | ||
| 166 | #include <asm-generic/iomap.h> | 166 | #include <asm-generic/iomap.h> |
| 167 | 167 | ||
| 168 | extern void *early_ioremap(unsigned long addr, unsigned long size); | ||
| 169 | extern void early_iounmap(void *addr, unsigned long size); | ||
| 170 | |||
| 171 | /* | 168 | /* |
| 172 | * This one maps high address device memory and turns off caching for that area. | 169 | * This one maps high address device memory and turns off caching for that area. |
| 173 | * it's useful if some control registers are in such an area and write combining | 170 | * it's useful if some control registers are in such an area and write combining |