Commit 3cf6b015 authored by Josh Triplett's avatar Josh Triplett
Browse files

Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless',... 

Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next
parents b25c2ff5 9def39be d3ac21ca 0da1d4a0 3afed06a

arch/x86/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ config X86 
	select HAVE_ACPI_APEI if ACPI

	select HAVE_ACPI_APEI_NMI if ACPI

	select ACPI_LEGACY_TABLES_LOOKUP if ACPI

	select X86_FEATURE_NAMES if PROC_FS



config INSTRUCTION_DECODER

	def_bool y
@@ -313,6 +314,17 @@ config SMP 


	  If you don't know what to do here, say N.



config X86_FEATURE_NAMES

	bool "Processor feature human-readable names" if EMBEDDED

	default y

	---help---

	  This option compiles in a table of x86 feature bits and corresponding

	  names.  This is required to support /proc/cpuinfo and a few kernel

	  messages.  You can disable this to save space, at the expense of

	  making those few kernel messages show numeric feature bits instead.



	  If in doubt, say Y.



config X86_X2APIC

	bool "Support x2apic"

	depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP

arch/x86/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -255,12 +255,6 @@ archclean: 
	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=arch/x86/tools



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 $(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)'

  echo  '  install      - Install kernel using'
@@ -274,5 +268,4 @@ define archhelp 
  echo  '                  bzdisk/fdimage*/isoimage also accept:'

  echo  '                  FDARGS="..."  arguments for the booted kernel'

  echo  '                  FDINITRD=file initrd for the booted kernel'

  echo  '  kvmconfig	- Enable additional options for guest kernel support'

endef

arch/x86/boot/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ setup-y += video-vesa.o 
setup-y		+= video-bios.o



targets		+= $(setup-y)

hostprogs-y	:= mkcpustr tools/build

hostprogs-y	:= tools/build

hostprogs-$(CONFIG_X86_FEATURE_NAMES) += mkcpustr



HOST_EXTRACFLAGS += -I$(srctree)/tools/include \

		    -include include/generated/autoconf.h \

	            -D__EXPORTED_HEADERS__



ifdef CONFIG_X86_FEATURE_NAMES

$(obj)/cpu.o: $(obj)/cpustr.h



quiet_cmd_cpustr = CPUSTR  $@
@@ -48,6 +50,7 @@ quiet_cmd_cpustr = CPUSTR $@ 
targets += cpustr.h

$(obj)/cpustr.h: $(obj)/mkcpustr FORCE

	$(call if_changed,cpustr)

endif



# ---------------------------------------------------------------------------

arch/x86/boot/compressed/Makefile

+10 −9
Original line number Diff line number Diff line
@@ -26,18 +26,19 @@ LDFLAGS_vmlinux := -T 
hostprogs-y	:= mkpiggy

HOST_EXTRACFLAGS += -I$(srctree)/tools/include



VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \

	$(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \

	$(obj)/piggy.o $(obj)/cpuflags.o $(obj)/aslr.o

vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \

	$(obj)/string.o $(obj)/cmdline.o \

	$(obj)/piggy.o $(obj)/cpuflags.o



vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o

vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o



$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone



ifeq ($(CONFIG_EFI_STUB), y)

	VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \

vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \

	$(objtree)/drivers/firmware/efi/libstub/lib.a

endif



$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE

$(obj)/vmlinux: $(vmlinux-objs-y) FORCE

	$(call if_changed,ld)

	@:
@@ -45,7 +46,7 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S 
$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



targets += $(patsubst $(obj)/%,%,$(VMLINUX_OBJS)) vmlinux.bin.all vmlinux.relocs

targets += $(patsubst $(obj)/%,%,$(vmlinux-objs-y)) vmlinux.bin.all vmlinux.relocs



CMD_RELOCS = arch/x86/tools/relocs

quiet_cmd_relocs = RELOCS  $@

arch/x86/boot/compressed/aslr.c

+0 −3
Original line number Diff line number Diff line 
#include "misc.h"



#ifdef CONFIG_RANDOMIZE_BASE

#include <asm/msr.h>

#include <asm/archrandom.h>

#include <asm/e820.h>
@@ -320,5 +319,3 @@ unsigned char *choose_kernel_location(unsigned char *input, 
out:

	return (unsigned char *)choice;

}
 


#endif /* CONFIG_RANDOMIZE_BASE */