Merge branch 'x86-setup-for-linus' of... (a417fb99) · Commits · 戴 / test

arch/x86/boot/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@ targets := vmlinux.bin setup.bin setup.elf bzImage
		targets += fdimage fdimage144 fdimage288 image.iso mtools.conf
		subdir- := compressed

		setup-y += a20.o bioscall.o cmdline.o copy.o cpu.o cpucheck.o edd.o
		setup-y += header.o main.o mca.o memory.o pm.o pmjump.o
		setup-y += printf.o regs.o string.o tty.o video.o video-mode.o
		setup-y += version.o
		setup-y += a20.o bioscall.o cmdline.o copy.o cpu.o cpucheck.o
		setup-y += early_serial_console.o edd.o header.o main.o mca.o memory.o
		setup-y += pm.o pmjump.o printf.o regs.o string.o tty.o video.o
		setup-y += video-mode.o version.o
		setup-$(CONFIG_X86_APM_BOOT) += apm.o

		# The link order of the video-*.o modules can matter. In particular,

arch/x86/boot/boot.h

+21 −7

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "bitops.h"
		#include <asm/cpufeature.h>
		#include <asm/processor-flags.h>
		#include "ctype.h"

		/* Useful macros */
		#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
		@@ -37,6 +38,8 @@
		extern struct setup_header hdr;
		extern struct boot_params boot_params;

		#define cpu_relax() asm volatile("rep; nop")

		/* Basic port I/O */
		static inline void outb(u8 v, u16 port)
		{
		@@ -198,11 +201,6 @@ static inline int memcmp_gs(const void *s1, addr_t s2, size_t len)
		return diff;
		}

		static inline int isdigit(int ch)
		{
		return (ch >= '0') && (ch <= '9');
		}

		/* Heap -- available for dynamic lists. */
		extern char _end[];
		extern char *HEAP;
		@@ -287,8 +285,18 @@ struct biosregs {
		void intcall(u8 int_no, const struct biosregs ireg, struct biosregs oreg);

		/* cmdline.c */
		int cmdline_find_option(const char option, char buffer, int bufsize);
		int cmdline_find_option_bool(const char *option);
		int __cmdline_find_option(u32 cmdline_ptr, const char option, char buffer, int bufsize);
		int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option);
		static inline int cmdline_find_option(const char option, char buffer, int bufsize)
		{
		return __cmdline_find_option(boot_params.hdr.cmd_line_ptr, option, buffer, bufsize);
		}

		static inline int cmdline_find_option_bool(const char *option)
		{
		return __cmdline_find_option_bool(boot_params.hdr.cmd_line_ptr, option);
		}


		/* cpu.c, cpucheck.c */
		struct cpu_features {
		@@ -300,6 +308,10 @@ extern struct cpu_features cpu;
		int check_cpu(int cpu_level_ptr, int req_level_ptr, u32 **err_flags_ptr);
		int validate_cpu(void);

		/* early_serial_console.c */
		extern int early_serial_base;
		void console_init(void);

		/* edd.c */
		void query_edd(void);

		@@ -329,8 +341,10 @@ void initregs(struct biosregs *regs);

		/* string.c */
		int strcmp(const char str1, const char str2);
		int strncmp(const char cs, const char ct, size_t count);
		size_t strnlen(const char *s, size_t maxlen);
		unsigned int atou(const char *s);
		unsigned long long simple_strtoull(const char cp, char *endp, unsigned int base);

		/* tty.c */
		void puts(const char *);

arch/x86/boot/cmdline.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -27,9 +27,8 @@ static inline int myisspace(u8 c)
		* Returns the length of the argument (regardless of if it was
		* truncated to fit in the buffer), or -1 on not found.
		*/
		int cmdline_find_option(const char option, char buffer, int bufsize)
		int __cmdline_find_option(u32 cmdline_ptr, const char option, char buffer, int bufsize)
		{
		u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr;
		addr_t cptr;
		char c;
		int len = -1;
		@@ -100,9 +99,8 @@ int cmdline_find_option(const char option, char buffer, int bufsize)
		* Returns the position of that option (starts counting with 1)
		* or 0 on not found
		*/
		int cmdline_find_option_bool(const char *option)
		int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option)
		{
		u32 cmdline_ptr = boot_params.hdr.cmd_line_ptr;
		addr_t cptr;
		char c;
		int pos = 0, wstart = 0;

arch/x86/boot/compressed/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		# create a compressed vmlinux image from the original vmlinux
		#

		targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o piggy.o
		targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo head_$(BITS).o misc.o string.o cmdline.o early_serial_console.o piggy.o

		KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
		KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
		@@ -23,7 +23,7 @@ LDFLAGS_vmlinux := -T

		hostprogs-y := mkpiggy

		$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/piggy.o FORCE
		$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o $(obj)/piggy.o FORCE
		$(call if_changed,ld)
		@:

arch/x86/boot/compressed/cmdline.c

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		#include "misc.h"

		static unsigned long fs;
		static inline void set_fs(unsigned long seg)
		{
		fs = seg << 4; /* shift it back */
		}
		typedef unsigned long addr_t;
		static inline char rdfs8(addr_t addr)
		{
		return ((char )(fs + addr));
		}
		#include "../cmdline.c"
		int cmdline_find_option(const char option, char buffer, int bufsize)
		{
		return __cmdline_find_option(real_mode->hdr.cmd_line_ptr, option, buffer, bufsize);
		}
		int cmdline_find_option_bool(const char *option)
		{
		return __cmdline_find_option_bool(real_mode->hdr.cmd_line_ptr, option);
		}

Admin message