diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:18 +0800 |
| commit | 1714a3e139090705a0bd862a8b7bba930181cfbd (patch) | |
| tree | db99631954ee29375180ac2fd1499a516c5b9ca7 /arch/x86/kernel | |
| parent | 25f89e269f5c5d06594098cc3b1d97554249f3f9 (diff) | |
| parent | 887b692a469f9a9a666654e607103f5204ac5eb7 (diff) | |
Merge tag 'v4.4.30' into linux-linaro-lsk-v4.4
This is the 4.4.30 stable release
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/early-quirks.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 9fdf1d330727..a257d6077d1b 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -331,12 +331,11 @@ static u32 __init i85x_stolen_base(int num, int slot, int func, size_t stolen_si static u32 __init i865_stolen_base(int num, int slot, int func, size_t stolen_size) { - /* - * FIXME is the graphics stolen memory region - * always at TOUD? Ie. is it always the last - * one to be allocated by the BIOS? - */ - return read_pci_config_16(0, 0, 0, I865_TOUD) << 16; + u16 toud = 0; + + toud = read_pci_config_16(0, 0, 0, I865_TOUD); + + return (phys_addr_t)(toud << 16) + i845_tseg_size(); } static size_t __init i830_stolen_size(int num, int slot, int func) |