diff options
| author | H. Peter Anvin | 2012-09-22 02:18:44 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2012-09-22 02:18:44 +0200 |
| commit | 49b8c695e331c9685e6ffdbf34872509d77c8459 (patch) | |
| tree | d4afdfae0115b2ab56687d23d6329d6ad934788f /arch/x86/kernel/probe_roms.c | |
| parent | x86-32, smap: Add STAC/CLAC instructions to 32-bit kernel entry (diff) | |
| parent | x86, kvm: fix kvm's usage of kernel_fpu_begin/end() (diff) | |
| download | kernel-qcow2-linux-49b8c695e331c9685e6ffdbf34872509d77c8459.tar.gz kernel-qcow2-linux-49b8c695e331c9685e6ffdbf34872509d77c8459.tar.xz kernel-qcow2-linux-49b8c695e331c9685e6ffdbf34872509d77c8459.zip | |
Merge branch 'x86/fpu' into x86/smap
Reason for merge:
x86/fpu changed the structure of some of the code that x86/smap
changes; mostly fpu-internal.h but also minor changes to the
signal code.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
arch/x86/ia32/ia32_signal.c
arch/x86/include/asm/fpu-internal.h
arch/x86/kernel/signal.c
Diffstat (limited to 'arch/x86/kernel/probe_roms.c')
| -rw-r--r-- | arch/x86/kernel/probe_roms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/probe_roms.c b/arch/x86/kernel/probe_roms.c index 0bc72e2069e3..d5f15c3f7b25 100644 --- a/arch/x86/kernel/probe_roms.c +++ b/arch/x86/kernel/probe_roms.c @@ -150,7 +150,7 @@ static struct resource *find_oprom(struct pci_dev *pdev) return oprom; } -void *pci_map_biosrom(struct pci_dev *pdev) +void __iomem *pci_map_biosrom(struct pci_dev *pdev) { struct resource *oprom = find_oprom(pdev); |