Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0988c37c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix crash due to missing debugctlmsr on AMD K6-3
  x86: add PTE_FLAGS_MASK
  x86: rename PTE_MASK to PTE_PFN_MASK
  x86: fix pte_flags() to only return flags, fix lguest (updated)
  x86: use setup_clear_cpu_cap with disable_apic, fix
  x86: move the last Dprintk instance to pr_debug()
parents 6eaaaac9 d536b1f8

arch/x86/Kconfig.cpu

+1 −1
Original line number Diff line number Diff line
@@ -414,4 +414,4 @@ config X86_MINIMUM_CPU_FAMILY 


config X86_DEBUGCTLMSR

	def_bool y

	depends on !(M586MMX || M586TSC || M586 || M486 || M386)
 
	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)

arch/x86/kernel/paravirt.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ struct pv_mmu_ops pv_mmu_ops = { 
#endif /* PAGETABLE_LEVELS >= 3 */



	.pte_val = native_pte_val,

	.pte_flags = native_pte_val,

	.pte_flags = native_pte_flags,

	.pgd_val = native_pgd_val,



	.make_pte = native_make_pte,

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ void __init setup_arch(char **cmdline_p) 
#ifdef CONFIG_X86_LOCAL_APIC

		disable_apic = 1;

#endif

		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

		setup_clear_cpu_cap(X86_FEATURE_APIC);

	}



#ifdef CONFIG_PCI

arch/x86/mach-es7000/es7000plat.c

+4 −4
Original line number Diff line number Diff line
@@ -130,9 +130,9 @@ parse_unisys_oem (char *oemptr) 
			mip_addr = val;

			mip = (struct mip_reg *)val;

			mip_reg = __va(mip);

			Dprintk("es7000_mipcfg: host_reg = 0x%lx \n",

			pr_debug("es7000_mipcfg: host_reg = 0x%lx \n",

				 (unsigned long)host_reg);

			Dprintk("es7000_mipcfg: mip_reg = 0x%lx \n",

			pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n",

				 (unsigned long)mip_reg);

			success++;

			break;

arch/x86/mm/dump_pagetables.c

+5 −5
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ static void note_page(struct seq_file *m, struct pg_state *st, 
	 * we have now. "break" is either changing perms, levels or

	 * address space marker.

	 */

	prot = pgprot_val(new_prot) & ~(PTE_MASK);

	cur = pgprot_val(st->current_prot) & ~(PTE_MASK);

	prot = pgprot_val(new_prot) & ~(PTE_PFN_MASK);

	cur = pgprot_val(st->current_prot) & ~(PTE_PFN_MASK);



	if (!st->level) {

		/* First entry */
@@ -221,7 +221,7 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, 
	for (i = 0; i < PTRS_PER_PMD; i++) {

		st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);

		if (!pmd_none(*start)) {

			pgprotval_t prot = pmd_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pmd_val(*start) & PTE_FLAGS_MASK;



			if (pmd_large(*start) || !pmd_present(*start))

				note_page(m, st, __pgprot(prot), 3);
@@ -253,7 +253,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr, 
	for (i = 0; i < PTRS_PER_PUD; i++) {

		st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);

		if (!pud_none(*start)) {

			pgprotval_t prot = pud_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pud_val(*start) & PTE_FLAGS_MASK;



			if (pud_large(*start) || !pud_present(*start))

				note_page(m, st, __pgprot(prot), 2);
@@ -288,7 +288,7 @@ static void walk_pgd_level(struct seq_file *m) 
	for (i = 0; i < PTRS_PER_PGD; i++) {

		st.current_address = normalize_addr(i * PGD_LEVEL_MULT);

		if (!pgd_none(*start)) {

			pgprotval_t prot = pgd_val(*start) & ~PTE_MASK;

			pgprotval_t prot = pgd_val(*start) & PTE_FLAGS_MASK;



			if (pgd_large(*start) || !pgd_present(*start))

				note_page(m, &st, __pgprot(prot), 1);