Merge commit 'b13b1d2d8692' into x86/mm
It got into x86/urgent but isn't really urgent material. Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
commit
6e8a1d49a9
8 changed files with 66 additions and 52 deletions
|
|
@ -250,8 +250,8 @@ archclean:
|
|||
PHONY += kvmconfig
|
||||
kvmconfig:
|
||||
$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
|
||||
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config
|
||||
$(Q)yes "" | $(MAKE) oldconfig
|
||||
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config
|
||||
$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
|
||||
|
||||
define archhelp
|
||||
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_s
|
|||
return base;
|
||||
}
|
||||
|
||||
#define KB(x) ((x) * 1024)
|
||||
#define KB(x) ((x) * 1024UL)
|
||||
#define MB(x) (KB (KB (x)))
|
||||
#define GB(x) (MB (KB (x)))
|
||||
|
||||
|
|
|
|||
|
|
@ -114,8 +114,8 @@ EXPORT_SYMBOL(machine_real_restart);
|
|||
*/
|
||||
static int __init set_pci_reboot(const struct dmi_system_id *d)
|
||||
{
|
||||
if (reboot_type != BOOT_CF9) {
|
||||
reboot_type = BOOT_CF9;
|
||||
if (reboot_type != BOOT_CF9_FORCE) {
|
||||
reboot_type = BOOT_CF9_FORCE;
|
||||
pr_info("%s series board detected. Selecting %s-method for reboots.\n",
|
||||
d->ident, "PCI");
|
||||
}
|
||||
|
|
@ -458,20 +458,23 @@ void __attribute__((weak)) mach_reboot_fixups(void)
|
|||
}
|
||||
|
||||
/*
|
||||
* Windows compatible x86 hardware expects the following on reboot:
|
||||
* To the best of our knowledge Windows compatible x86 hardware expects
|
||||
* the following on reboot:
|
||||
*
|
||||
* 1) If the FADT has the ACPI reboot register flag set, try it
|
||||
* 2) If still alive, write to the keyboard controller
|
||||
* 3) If still alive, write to the ACPI reboot register again
|
||||
* 4) If still alive, write to the keyboard controller again
|
||||
* 5) If still alive, call the EFI runtime service to reboot
|
||||
* 6) If still alive, write to the PCI IO port 0xCF9 to reboot
|
||||
* 7) If still alive, inform BIOS to do a proper reboot
|
||||
* 6) If no EFI runtime service, call the BIOS to do a reboot
|
||||
*
|
||||
* If the machine is still alive at this stage, it gives up. We default to
|
||||
* following the same pattern, except that if we're still alive after (7) we'll
|
||||
* try to force a triple fault and then cycle between hitting the keyboard
|
||||
* controller and doing that
|
||||
* We default to following the same pattern. We also have
|
||||
* two other reboot methods: 'triple fault' and 'PCI', which
|
||||
* can be triggered via the reboot= kernel boot option or
|
||||
* via quirks.
|
||||
*
|
||||
* This means that this function can never return, it can misbehave
|
||||
* by not rebooting properly and hanging.
|
||||
*/
|
||||
static void native_machine_emergency_restart(void)
|
||||
{
|
||||
|
|
@ -492,6 +495,11 @@ static void native_machine_emergency_restart(void)
|
|||
for (;;) {
|
||||
/* Could also try the reset bit in the Hammer NB */
|
||||
switch (reboot_type) {
|
||||
case BOOT_ACPI:
|
||||
acpi_reboot();
|
||||
reboot_type = BOOT_KBD;
|
||||
break;
|
||||
|
||||
case BOOT_KBD:
|
||||
mach_reboot_fixups(); /* For board specific fixups */
|
||||
|
||||
|
|
@ -509,43 +517,29 @@ static void native_machine_emergency_restart(void)
|
|||
}
|
||||
break;
|
||||
|
||||
case BOOT_TRIPLE:
|
||||
load_idt(&no_idt);
|
||||
__asm__ __volatile__("int3");
|
||||
|
||||
/* We're probably dead after this, but... */
|
||||
reboot_type = BOOT_KBD;
|
||||
break;
|
||||
|
||||
case BOOT_BIOS:
|
||||
machine_real_restart(MRR_BIOS);
|
||||
|
||||
/* We're probably dead after this, but... */
|
||||
reboot_type = BOOT_TRIPLE;
|
||||
break;
|
||||
|
||||
case BOOT_ACPI:
|
||||
acpi_reboot();
|
||||
reboot_type = BOOT_KBD;
|
||||
break;
|
||||
|
||||
case BOOT_EFI:
|
||||
if (efi_enabled(EFI_RUNTIME_SERVICES))
|
||||
efi.reset_system(reboot_mode == REBOOT_WARM ?
|
||||
EFI_RESET_WARM :
|
||||
EFI_RESET_COLD,
|
||||
EFI_SUCCESS, 0, NULL);
|
||||
reboot_type = BOOT_CF9_COND;
|
||||
reboot_type = BOOT_BIOS;
|
||||
break;
|
||||
|
||||
case BOOT_CF9:
|
||||
case BOOT_BIOS:
|
||||
machine_real_restart(MRR_BIOS);
|
||||
|
||||
/* We're probably dead after this, but... */
|
||||
reboot_type = BOOT_CF9_SAFE;
|
||||
break;
|
||||
|
||||
case BOOT_CF9_FORCE:
|
||||
port_cf9_safe = true;
|
||||
/* Fall through */
|
||||
|
||||
case BOOT_CF9_COND:
|
||||
case BOOT_CF9_SAFE:
|
||||
if (port_cf9_safe) {
|
||||
u8 reboot_code = reboot_mode == REBOOT_WARM ?
|
||||
0x06 : 0x0E;
|
||||
u8 reboot_code = reboot_mode == REBOOT_WARM ? 0x06 : 0x0E;
|
||||
u8 cf9 = inb(0xcf9) & ~reboot_code;
|
||||
outb(cf9|2, 0xcf9); /* Request hard reset */
|
||||
udelay(50);
|
||||
|
|
@ -553,7 +547,15 @@ static void native_machine_emergency_restart(void)
|
|||
outb(cf9|reboot_code, 0xcf9);
|
||||
udelay(50);
|
||||
}
|
||||
reboot_type = BOOT_BIOS;
|
||||
reboot_type = BOOT_TRIPLE;
|
||||
break;
|
||||
|
||||
case BOOT_TRIPLE:
|
||||
load_idt(&no_idt);
|
||||
__asm__ __volatile__("int3");
|
||||
|
||||
/* We're probably dead after this, but... */
|
||||
reboot_type = BOOT_KBD;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -399,13 +399,20 @@ int pmdp_test_and_clear_young(struct vm_area_struct *vma,
|
|||
int ptep_clear_flush_young(struct vm_area_struct *vma,
|
||||
unsigned long address, pte_t *ptep)
|
||||
{
|
||||
int young;
|
||||
|
||||
young = ptep_test_and_clear_young(vma, address, ptep);
|
||||
if (young)
|
||||
flush_tlb_page(vma, address);
|
||||
|
||||
return young;
|
||||
/*
|
||||
* On x86 CPUs, clearing the accessed bit without a TLB flush
|
||||
* doesn't cause data corruption. [ It could cause incorrect
|
||||
* page aging and the (mistaken) reclaim of hot pages, but the
|
||||
* chance of that should be relatively low. ]
|
||||
*
|
||||
* So as a performance optimization don't flush the TLB when
|
||||
* clearing the accessed bit, it will eventually be flushed by
|
||||
* a context switch or a VM operation anyway. [ In the rare
|
||||
* event of it not getting flushed for a long time the delay
|
||||
* shouldn't really matter because there's no real memory
|
||||
* pressure for swapout to react to. ]
|
||||
*/
|
||||
return ptep_test_and_clear_young(vma, address, ptep);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
||||
|
|
|
|||
|
|
@ -54,5 +54,7 @@ syshdr-$(CONFIG_X86_64) += syscalls_64.h
|
|||
|
||||
targets += $(uapisyshdr-y) $(syshdr-y)
|
||||
|
||||
PHONY += all
|
||||
all: $(addprefix $(uapi)/,$(uapisyshdr-y))
|
||||
all: $(addprefix $(out)/,$(syshdr-y))
|
||||
@:
|
||||
|
|
|
|||
|
|
@ -359,3 +359,4 @@
|
|||
350 i386 finit_module sys_finit_module
|
||||
351 i386 sched_setattr sys_sched_setattr
|
||||
352 i386 sched_getattr sys_sched_getattr
|
||||
353 i386 renameat2 sys_renameat2
|
||||
|
|
|
|||
|
|
@ -40,4 +40,6 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/ina
|
|||
HOST_EXTRACFLAGS += -I$(srctree)/tools/include
|
||||
hostprogs-y += relocs
|
||||
relocs-objs := relocs_32.o relocs_64.o relocs_common.o
|
||||
PHONY += relocs
|
||||
relocs: $(obj)/relocs
|
||||
@:
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ enum reboot_mode {
|
|||
extern enum reboot_mode reboot_mode;
|
||||
|
||||
enum reboot_type {
|
||||
BOOT_TRIPLE = 't',
|
||||
BOOT_KBD = 'k',
|
||||
BOOT_BIOS = 'b',
|
||||
BOOT_ACPI = 'a',
|
||||
BOOT_EFI = 'e',
|
||||
BOOT_CF9 = 'p',
|
||||
BOOT_CF9_COND = 'q',
|
||||
BOOT_TRIPLE = 't',
|
||||
BOOT_KBD = 'k',
|
||||
BOOT_BIOS = 'b',
|
||||
BOOT_ACPI = 'a',
|
||||
BOOT_EFI = 'e',
|
||||
BOOT_CF9_FORCE = 'p',
|
||||
BOOT_CF9_SAFE = 'q',
|
||||
};
|
||||
extern enum reboot_type reboot_type;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue