Yinghai Lu 4ce7a8697c x86: revert wrong memblock current limit setting ...

Dave reported big numa system booting is broken.

It turns out that commit 5b6e529521d3 ("x86: memblock: set current limit
to max low memory address") sets the limit to low wrongly.

max_low_pfn_mapped is different from max_pfn_mapped.
max_low_pfn_mapped is always under 4G.

That will memblock_alloc_nid all go under 4G.

Revert 5b6e529521d3 to fix a no-boot regression which was triggered by
457ff1de2d24 ("lib/swiotlb.c: use memblock apis for early memory
allocations").

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reported-by: Dave Hansen <dave.hansen@intel.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2014-01-27 21:02:38 -08:00

..

acpi

ACPI and power management updates for 3.14-rc1

2014-01-24 15:51:02 -08:00

apic

ACPI and power management updates for 3.14-rc1

2014-01-24 15:51:02 -08:00

cpu

Driver core / sysfs patches for 3.14-rc1

2014-01-20 15:49:44 -08:00

kprobes

Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:42:44 -07:00

.gitignore

…

alternative.c

lockdep, x86/alternatives: Drop ancient lockdep fixup message

2013-09-28 10:09:41 +02:00

amd_gart_64.c

x86, mm: use pfn_range_is_mapped() with gart

2012-11-17 11:59:10 -08:00

amd_nb.c

x86, amd_nb: Clarify F15h, model 30h GART and L3 support

2013-08-12 15:30:08 +02:00

apb_timer.c

intel_mid: Renamed *mrst* to *intel_mid*

2013-10-17 16:40:47 -07:00

aperture_64.c

x86/mm/gart: Drop unnecessary check

2013-04-16 10:54:40 +02:00

apm_32.c

x86, asmlinkage, apm: Make APM data structure used from assembler visible

2013-08-06 14:20:20 -07:00

asm-offsets_32.c

x86: Get rid of ->hard_math and all the FPU asm fu

2013-06-06 14:32:04 -07:00

asm-offsets_64.c

x86, gdt, hibernate: Store/load GDT for hibernate path.

2013-05-02 11:27:35 -07:00

asm-offsets.c

sched, x86: Provide a per-cpu preempt_count implementation

2013-09-25 14:07:57 +02:00

audit_64.c

…

bootflag.c

…

check.c

x86/mm: memblock: switch to use NUMA_NO_NODE

2014-01-21 16:19:47 -08:00

cpuid.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

crash_dump_32.c

x86: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:15 +08:00

crash_dump_64.c

…

crash.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

devicetree.c

Merge remote-tracking branch 'grant/devicetree/next' into for-next

2013-11-07 10:34:46 -06:00

doublefault.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

dumpstack_32.c

dump_stack: unify debug information printed by show_regs()

2013-04-30 17:04:02 -07:00

dumpstack_64.c

dump_stack: unify debug information printed by show_regs()

2013-04-30 17:04:02 -07:00

dumpstack.c

x86/dumpstack: Fix printk_address for direct addresses

2013-11-12 21:06:06 +01:00

e820.c

x86/mm: memblock: switch to use NUMA_NO_NODE

2014-01-21 16:19:47 -08:00

early_printk.c

Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-12 11:12:22 +09:00

early-quirks.c

x86/early quirk: use gen6 stolen detection for VLV

2013-11-14 09:32:11 +01:00

entry_32.S

ftrace/x86: Load ftrace_ops in parameter not the variable holding it

2014-01-09 13:24:29 -08:00

entry_64.S

ftrace/x86: Load ftrace_ops in parameter not the variable holding it

2014-01-09 13:24:29 -08:00

ftrace.c

ftrace/x86: skip over the breakpoint for ftrace caller

2013-11-05 16:01:47 -05:00

head32.c

intel_mid: Renamed *mrst* to *intel_mid*

2013-10-17 16:40:47 -07:00

head64.c

x86, trace: Register exception handler to trace IDT

2013-11-08 14:15:45 -08:00

head_32.S

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:11:16 -07:00

head_64.S

x86: Make sure IDT is page aligned

2013-07-16 15:14:48 -07:00

head.c

x86: Make sure we can boot in the case the BDA contains pure garbage

2013-02-27 13:38:57 -08:00

hpet.c

x86, hpet: Introduce x86_msi_ops.setup_hpet_msi

2013-01-28 10:48:30 +01:00

hw_breakpoint.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

i386_ksyms_32.c

sched, x86: Optimize the preempt_schedule() call

2013-09-25 14:23:07 +02:00

i387.c

x86: move fpu_counter into ARCH specific thread_struct

2013-11-13 12:09:13 +09:00

i8237.c

…

i8253.c

x86: Use common i8253 clockevent

2011-07-01 10:37:14 +02:00

i8259.c

x86/irq: Correct comment about i8259 initialization

2013-09-04 07:46:04 +02:00

io_delay.c

…

ioport.c

x86: get rid of pt_regs argument of iopl(2)

2013-02-03 18:16:24 -05:00

iosf_mbi.c

arch: x86: New MailBox support driver for Intel SOC's

2014-01-08 14:36:29 -08:00

irq_32.c

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-12 10:20:12 +09:00

irq_64.c

irq: Consolidate do_softirq() arch overriden implementations

2013-10-01 12:53:25 +02:00

irq_work.c

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible

2013-08-06 14:18:23 -07:00

irq.c

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-01-20 12:11:41 -08:00

irqinit.c

x86/irq: Fix do_IRQ() interrupt warning for cpu hotplug retriggered irqs

2014-01-12 13:13:02 +01:00

jump_label.c

x86/jump_label: expect default_nop if static_key gets enabled on boot-up

2013-10-19 19:45:35 -04:00

kdebugfs.c

arch/x86/kernel/kdebugfs.c: Ensure a consistent return value in error case

2012-07-26 15:07:20 +02:00

kgdb.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

ksysfs.c

x86: ksysfs.c build fix

2014-01-03 14:37:13 +00:00

kvm.c

x86, trace: Register exception handler to trace IDT

2013-11-08 14:15:45 -08:00

kvmclock.c

pvclock: detect watchdog reset at pvclock read

2013-11-06 09:48:43 +02:00

ldt.c

Disintegrate asm/system.h for X86

2012-03-28 18:11:12 +01:00

machine_kexec_32.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

machine_kexec_64.c

x86, kexec, 64bit: Only set ident mapping for ram.

2013-01-29 15:26:35 -08:00

Makefile

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-01-20 12:09:31 -08:00

mmconf-fam10h_64.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

module.c

mm/arch: use NUMA_NO_NODE

2013-11-13 12:09:05 +09:00

mpparse.c

Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-05-29 20:14:53 -07:00

msr.c

x86, msr: Use file_inode(), not f_mapping->host

2013-10-08 12:01:29 -07:00

nmi_selftest.c

x86/nmi: Clean up register_nmi_handler() usage

2012-06-20 14:23:17 +02:00

nmi.c

perf/x86: Fix NMI measurements

2013-10-29 12:01:20 +01:00

paravirt_patch_32.c

…

paravirt_patch_64.c

…

paravirt-spinlocks.c

x86, ticketlock: Add slowpath logic

2013-08-09 07:54:00 -07:00

paravirt.c

x86, paravirt: Remove duplicate definition for DEF_NATIVE

2013-09-04 09:46:43 -07:00

pci-calgary_64.c

x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>

2012-06-06 09:17:22 +02:00

pci-dma.c

x86/dma-debug: Bump PREALLOC_DMA_DEBUG_ENTRIES

2013-01-24 17:34:18 +01:00

pci-iommu_table.c

…

pci-nommu.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

pci-swiotlb.c

X86 & IA64: adapt for dma_map_ops changes

2012-03-28 16:36:31 +02:00

pcspeaker.c

…

perf_regs.c

perf: Fix off by one test in perf_reg_value()

2012-09-19 17:08:40 +02:00

preempt.S

sched, x86: Optimize the preempt_schedule() call

2013-09-25 14:23:07 +02:00

probe_roms.c

x86/pci/probe_roms: Add missing __iomem annotation to pci_map_biosrom()

2012-09-05 10:52:25 +02:00

process_32.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

process_64.c

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-14 16:55:56 +09:00

process.c

sched, idle: Fix the idle polling state logic

2013-09-25 13:53:10 +02:00

ptrace.c

ptrace/x86: cleanup ptrace_set_debugreg()

2013-07-09 10:33:26 -07:00

pvclock.c

hung_task: add method to reset detector

2013-11-06 09:49:02 +02:00

quirks.c

x86, quirks: Shut-up a long-standing gcc warning

2013-04-02 16:03:34 -07:00

reboot_fixups_32.c

…

reboot.c

x86/apic, doc: Justification for disabling IO APIC before Local APIC

2013-12-04 19:33:21 -08:00

relocate_kernel_32.S

x86, asm, cleanup: Replace open-coded control register values with symbolic

2013-06-25 16:26:06 -07:00

relocate_kernel_64.S

x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S

2013-06-20 21:30:04 -07:00

resource.c

…

rtc.c

Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-12 11:12:22 +09:00

setup_percpu.c

x86: Add read_mostly declaration/definition to variables from smp.h

2012-06-14 12:42:11 +02:00

setup.c

x86: revert wrong memblock current limit setting

2014-01-27 21:02:38 -08:00

signal.c

Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 11:08:32 -07:00

smp.c

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible

2013-08-06 14:18:23 -07:00

smpboot.c

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-01-20 12:11:41 -08:00

stacktrace.c

x86: Swap save_stack_trace_regs parameters

2011-06-14 22:48:51 -04:00

step.c

ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL

2013-01-22 10:08:00 -08:00

sys_x86_64.c

x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member

2013-08-22 10:19:35 -07:00

syscall_32.c

x86, asmlinkage: Make syscall tables visible

2013-08-06 14:20:18 -07:00

syscall_64.c

x86, asmlinkage: Make syscall tables visible

2013-08-06 14:20:18 -07:00

sysfb_efi.c

x86: sysfb: move EFI quirks from efifb to sysfb

2013-08-02 16:17:47 -07:00

sysfb_simplefb.c

x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning

2013-10-03 07:51:11 +02:00

sysfb.c

x86: sysfb: move EFI quirks from efifb to sysfb

2013-08-02 16:17:47 -07:00

tboot.c

x86 / tboot / ACPI: Fail extended mode reduced hardware sleep

2013-07-31 14:25:51 +02:00

tce_64.c

Disintegrate asm/system.h for X86

2012-03-28 18:11:12 +01:00

test_nx.c

…

test_rodata.c

x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c

2012-04-20 13:51:38 -07:00

time.c

MCA: delete all remaining traces of microchannel bus support.

2012-05-17 19:06:13 -04:00

tls.c

make SYSCALL_DEFINE<n>-generated wrappers do asmlinkage_protect

2013-03-03 22:58:33 -05:00

tls.h

…

topology.c

hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock()

2013-09-30 19:55:51 +02:00

trace_clock.c

tracing,x86: Add a TSC trace_clock

2012-11-13 15:48:27 -05:00

tracepoint.c

x86: Make sure IDT is page aligned

2013-07-16 15:14:48 -07:00

traps.c

x86/traps: Clean up error exception handler definitions

2013-12-12 14:46:42 +01:00

tsc_msr.c

x86, tsc, apic: Unbreak static (MSR) calibration when CONFIG_X86_LOCAL_APIC=n

2014-01-16 13:00:21 -08:00

tsc_sync.c

x86: Delete non-required instances of include <linux/init.h>

2014-01-06 21:25:18 -08:00

tsc.c

sched/x86/tsc: Initialize multiplier to 0

2014-01-23 14:48:36 +01:00

uprobes.c

uretprobes/x86: Hijack return address

2013-04-13 15:31:55 +02:00

verify_cpu.S

…

vm86_32.c

x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)

2013-05-02 20:36:32 -04:00

vmlinux.lds.S

x86: intel-mid: Add section for sfi device table

2013-10-17 16:41:04 -07:00

vsmp_64.c

x86/apic/x2apic: Limit the vector reservation to the user specified mask

2012-07-06 11:00:22 +02:00

vsyscall_64.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

vsyscall_emu_64.S

x86-64: Rework vsyscall emulation and add vsyscall= parameter

2011-08-10 19:26:46 -05:00

vsyscall_trace.h

x86-64: Add vsyscall:emulate_vsyscall trace event

2011-08-04 16:13:53 -07:00

x86_init.c

PCI: Drop "irq" param from *_restore_msi_irqs()

2013-12-13 08:44:30 -07:00

x8664_ksyms_64.c

sched, x86: Optimize the preempt_schedule() call

2013-09-25 14:23:07 +02:00

xsave.c

x86, xsave: Support eager-only xsave features, add MPX support

2013-12-06 17:17:42 -08:00