diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:42:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:42:04 +0200 |
| commit | 8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch) | |
| tree | 26a36ec23067a9e26baf3d46c65f70619ca4d808 /arch/x86/include/asm/realmode.h | |
| parent | 4d537f37e0d39f64687be71087dca607ee507f5a (diff) | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
| download | linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.tar.gz linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.tar.bz2 linux-8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905.zip | |
Merge 5.1-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/realmode.h')
| -rw-r--r-- | arch/x86/include/asm/realmode.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index 63b3393bd98e..c53682303c9c 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -77,7 +77,11 @@ static inline size_t real_mode_size_needed(void) return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE); } -void set_real_mode_mem(phys_addr_t mem, size_t size); +static inline void set_real_mode_mem(phys_addr_t mem) +{ + real_mode_header = (struct real_mode_header *) __va(mem); +} + void reserve_real_mode(void); #endif /* __ASSEMBLY__ */ |