Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (42576bee) · Commits · e / devices / android_kernel_teracube_mt6765

arch/x86/boot/tools/build.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ typedef unsigned int u32;

	/* This must be large enough to hold the entire setup */		/* This must be large enough to hold the entire setup */
	u8 buf[SETUP_SECT_MAX*512];		u8 buf[SETUP_SECT_MAX*512];
	int is_big_kernel;

	#define PECOFF_RELOC_RESERVE 0x20		#define PECOFF_RELOC_RESERVE 0x20

arch/x86/kernel/head64.c

+3 −11

Original line number	Original line	Diff line number	Diff line
	@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL \| _PAGE_NX);
	/* Wipe all early page tables except for the kernel symbol map */		/* Wipe all early page tables except for the kernel symbol map */
	static void __init reset_early_page_tables(void)		static void __init reset_early_page_tables(void)
	{		{
	unsigned long i;		memset(early_level4_pgt, 0, sizeof(pgd_t)*(PTRS_PER_PGD-1));

	for (i = 0; i < PTRS_PER_PGD-1; i++)
	early_level4_pgt[i].pgd = 0;

	next_early_pgt = 0;		next_early_pgt = 0;

	write_cr3(__pa_nodebug(early_level4_pgt));		write_cr3(__pa_nodebug(early_level4_pgt));
	}		}

	@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
	int __init early_make_pgtable(unsigned long address)		int __init early_make_pgtable(unsigned long address)
	{		{
	unsigned long physaddr = address - __PAGE_OFFSET;		unsigned long physaddr = address - __PAGE_OFFSET;
	unsigned long i;
	pgdval_t pgd, *pgd_p;		pgdval_t pgd, *pgd_p;
	pudval_t pud, *pud_p;		pudval_t pud, *pud_p;
	pmdval_t pmd, *pmd_p;		pmdval_t pmd, *pmd_p;
	@@ -81,8 +75,7 @@ int __init early_make_pgtable(unsigned long address)
	}		}

	pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
	for (i = 0; i < PTRS_PER_PUD; i++)		memset(pud_p, 0, sizeof(pud_p) PTRS_PER_PUD);
	pud_p[i] = 0;
	*pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;		*pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
	}		}
	pud_p += pud_index(address);		pud_p += pud_index(address);
	@@ -97,8 +90,7 @@ int __init early_make_pgtable(unsigned long address)
	}		}

	pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
	for (i = 0; i < PTRS_PER_PMD; i++)		memset(pmd_p, 0, sizeof(pmd_p) PTRS_PER_PMD);
	pmd_p[i] = 0;
	*pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;		*pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
	}		}
	pmd = (physaddr & PMD_MASK) + early_pmd_flags;		pmd = (physaddr & PMD_MASK) + early_pmd_flags;

arch/x86/kernel/head_64.S

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -75,9 +75,7 @@ startup_64:
	subq $_text - __START_KERNEL_map, %rbp		subq $_text - __START_KERNEL_map, %rbp

	/* Is the address not 2M aligned? */		/* Is the address not 2M aligned? */
	movq %rbp, %rax		testl $~PMD_PAGE_MASK, %ebp
	andl $~PMD_PAGE_MASK, %eax
	testl %eax, %eax
	jnz bad_address		jnz bad_address

	/*		/*

arch/x86/lib/cmdline.c

+43 −17

Original line number	Original line	Diff line number	Diff line
	@@ -21,12 +21,16 @@ static inline int myisspace(u8 c)
	* @option: option string to look for		* @option: option string to look for
	*		*
	* Returns the position of that @option (starts counting with 1)		* Returns the position of that @option (starts counting with 1)
	* or 0 on not found.		* or 0 on not found. @option will only be found if it is found
			* as an entire word in @cmdline. For instance, if @option="car"
			* then a cmdline which contains "cart" will not match.
	*/		*/
	int cmdline_find_option_bool(const char cmdline, const char option)		static int
			__cmdline_find_option_bool(const char *cmdline, int max_cmdline_size,
			const char *option)
	{		{
	char c;		char c;
	int len, pos = 0, wstart = 0;		int pos = 0, wstart = 0;
	const char *opptr = NULL;		const char *opptr = NULL;
	enum {		enum {
	st_wordstart = 0, /* Start of word/after whitespace */		st_wordstart = 0, /* Start of word/after whitespace */
	@@ -37,11 +41,11 @@ int cmdline_find_option_bool(const char cmdline, const char option)
	if (!cmdline)		if (!cmdline)
	return -1; /* No command line */		return -1; /* No command line */

	len = min_t(int, strlen(cmdline), COMMAND_LINE_SIZE);		/*
	if (!len)		* This 'pos' check ensures we do not overrun
	return 0;		* a non-NULL-terminated 'cmdline'
			*/
	while (len--) {		while (pos < max_cmdline_size) {
	c = (char )cmdline++;		c = (char )cmdline++;
	pos++;		pos++;

	@@ -58,18 +62,35 @@ int cmdline_find_option_bool(const char cmdline, const char option)
	/* fall through */		/* fall through */

	case st_wordcmp:		case st_wordcmp:
	if (!*opptr)		if (!*opptr) {
			/*
			* We matched all the way to the end of the
			* option we were looking for. If the
			* command-line has a space _or_ ends, then
			* we matched!
			*/
	if (!c \|\| myisspace(c))		if (!c \|\| myisspace(c))
	return wstart;		return wstart;
	else		/*
	state = st_wordskip;		* We hit the end of the option, but _not_
	else if (!c)		* the end of a word on the cmdline. Not
			* a match.
			*/
			} else if (!c) {
			/*
			* Hit the NULL terminator on the end of
			* cmdline.
			*/
	return 0;		return 0;
	else if (c != *opptr++)		} else if (c == *opptr++) {
	state = st_wordskip;		/*
	else if (!len) /* last word and is matching */		* We are currently matching, so continue
	return wstart;		* to the next character on the cmdline.
			*/
	break;		break;
			}
			state = st_wordskip;
			/* fall through */

	case st_wordskip:		case st_wordskip:
	if (!c)		if (!c)
	@@ -82,3 +103,8 @@ int cmdline_find_option_bool(const char cmdline, const char option)

	return 0; /* Buffer overrun */		return 0; /* Buffer overrun */
	}		}

			int cmdline_find_option_bool(const char cmdline, const char option)
			{
			return __cmdline_find_option_bool(cmdline, COMMAND_LINE_SIZE, option);
			}