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

Commit 80f33a5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/rtc: Remove duplicate const specifier
  x86, early_serial_console: Remove unnecessary check
  x86, early_serial_console: Remove unused macro XMTRDY
  x86, setup: Rename BOOT_ISDIGIT_H to BOOT_CTYPE_H
  x86, CPU: Fix trivial printk formatting issues with dmesg
parents 7453311d d505ad1d

arch/x86/boot/ctype.h

+2 −3
Original line number Original line Diff line number Diff line 
#ifndef BOOT_ISDIGIT_H

#ifndef BOOT_CTYPE_H



#define BOOT_CTYPE_H

#define BOOT_ISDIGIT_H





static inline int isdigit(int ch)

static inline int isdigit(int ch)

{

{

arch/x86/boot/early_serial_console.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -2,8 +2,6 @@ 




#define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */

#define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */





#define XMTRDY          0x20



#define DLAB		0x80

#define DLAB		0x80





#define TXR             0       /*  Transmit register (WRITE) */

#define TXR             0       /*  Transmit register (WRITE) */
@@ -74,7 +72,7 @@ static void parse_earlyprintk(void) 
			static const int bases[] = { 0x3f8, 0x2f8 };

			static const int bases[] = { 0x3f8, 0x2f8 };

			int idx = 0;

			int idx = 0;





			if (!strncmp(arg + pos, "ttyS", 4))

			/* += strlen("ttyS"); */

			pos += 4;

			pos += 4;





			if (arg[pos++] == '1')

			if (arg[pos++] == '1')

arch/x86/kernel/cpu/common.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -491,17 +491,18 @@ u16 __read_mostly tlb_lld_2m[NR_INFO]; 
u16 __read_mostly tlb_lld_4m[NR_INFO];

u16 __read_mostly tlb_lld_4m[NR_INFO];

u16 __read_mostly tlb_lld_1g[NR_INFO];

u16 __read_mostly tlb_lld_1g[NR_INFO];





void cpu_detect_tlb(struct cpuinfo_x86 *c)

static void cpu_detect_tlb(struct cpuinfo_x86 *c)

{

{

	if (this_cpu->c_detect_tlb)

	if (this_cpu->c_detect_tlb)

		this_cpu->c_detect_tlb(c);

		this_cpu->c_detect_tlb(c);





	printk(KERN_INFO "Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n"

	pr_info("Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n",

		"Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n",

		tlb_lli_4k[ENTRIES], tlb_lli_2m[ENTRIES],

		tlb_lli_4k[ENTRIES], tlb_lli_2m[ENTRIES],

		tlb_lli_4m[ENTRIES], tlb_lld_4k[ENTRIES],

		tlb_lli_4m[ENTRIES]);

		tlb_lld_2m[ENTRIES], tlb_lld_4m[ENTRIES],



		tlb_lld_1g[ENTRIES]);

	pr_info("Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n",

		tlb_lld_4k[ENTRIES], tlb_lld_2m[ENTRIES],

		tlb_lld_4m[ENTRIES], tlb_lld_1g[ENTRIES]);

}

}





void detect_ht(struct cpuinfo_x86 *c)

void detect_ht(struct cpuinfo_x86 *c)

arch/x86/kernel/cpu/intel.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -487,10 +487,8 @@ static void init_intel(struct cpuinfo_x86 *c) 




		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {

		if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {

			printk_once(KERN_WARNING "ENERGY_PERF_BIAS:"

			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");

				" Set to 'normal', was 'performance'\n"

			pr_warn_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");

				"ENERGY_PERF_BIAS: View and update with"

				" x86_energy_perf_policy(8)\n");

			epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;

			epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;

			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		}

		}

arch/x86/kernel/rtc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -170,7 +170,7 @@ static struct platform_device rtc_device = { 
static __init int add_rtc_cmos(void)

static __init int add_rtc_cmos(void)

{

{

#ifdef CONFIG_PNP

#ifdef CONFIG_PNP

	static const char * const  const ids[] __initconst =

	static const char * const ids[] __initconst =

	    { "PNP0b00", "PNP0b01", "PNP0b02", };

	    { "PNP0b00", "PNP0b01", "PNP0b02", };

	struct pnp_dev *dev;

	struct pnp_dev *dev;

	struct pnp_id *id;

	struct pnp_id *id;