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

Commit 0091945b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Convert set_atomicity_lock to raw_spinlock
  x86, mtrr: Kill over the top warn
  x86, mtrr: Constify struct mtrr_ops
parents 46bbffad 40d6753e

arch/x86/kernel/cpu/mtrr/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base, unsigned long size, unsigned int type) 
	return 0;

}



static struct mtrr_ops amd_mtrr_ops = {

static const struct mtrr_ops amd_mtrr_ops = {

	.vendor            = X86_VENDOR_AMD,

	.set               = amd_set_mtrr,

	.get               = amd_get_mtrr,

arch/x86/kernel/cpu/mtrr/centaur.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long base, unsigned long size, unsigned int t 
	return 0;

}



static struct mtrr_ops centaur_mtrr_ops = {

static const struct mtrr_ops centaur_mtrr_ops = {

	.vendor            = X86_VENDOR_CENTAUR,

	.set               = centaur_set_mcr,

	.get               = centaur_get_mcr,

arch/x86/kernel/cpu/mtrr/cyrix.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 
	post_set();

}



static struct mtrr_ops cyrix_mtrr_ops = {

static const struct mtrr_ops cyrix_mtrr_ops = {

	.vendor            = X86_VENDOR_CYRIX,

	.set_all	   = cyrix_set_all,

	.set               = cyrix_set_arr,

arch/x86/kernel/cpu/mtrr/generic.c

+5 −5
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, 
		tmp |= ~((1<<(hi - 1)) - 1);



		if (tmp != mask_lo) {

			WARN_ONCE(1, KERN_INFO "mtrr: your BIOS has set up an incorrect mask, fixing it up.\n");

			printk(KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n");

			mask_lo = tmp;

		}

	}
@@ -570,7 +570,7 @@ static unsigned long set_mtrr_state(void) 




static unsigned long cr4;

static DEFINE_SPINLOCK(set_atomicity_lock);

static DEFINE_RAW_SPINLOCK(set_atomicity_lock);



/*

 * Since we are disabling the cache don't allow any interrupts,
@@ -590,7 +590,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock) 
	 * changes to the way the kernel boots

	 */



	spin_lock(&set_atomicity_lock);

	raw_spin_lock(&set_atomicity_lock);



	/* Enter the no-fill (CD=1, NW=0) cache mode and flush caches. */

	cr0 = read_cr0() | X86_CR0_CD;
@@ -627,7 +627,7 @@ static void post_set(void) __releases(set_atomicity_lock) 
	/* Restore value of CR4 */

	if (cpu_has_pge)

		write_cr4(cr4);

	spin_unlock(&set_atomicity_lock);

	raw_spin_unlock(&set_atomicity_lock);

}



static void generic_set_all(void)
@@ -752,7 +752,7 @@ int positive_have_wrcomb(void) 
/*

 * Generic structure...

 */

struct mtrr_ops generic_mtrr_ops = {

const struct mtrr_ops generic_mtrr_ops = {

	.use_intel_if		= 1,

	.set_all		= generic_set_all,

	.get			= generic_get_mtrr,

arch/x86/kernel/cpu/mtrr/main.c

+3 −3
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 
u64 size_or_mask, size_and_mask;

static bool mtrr_aps_delayed_init;



static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];

static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];



struct mtrr_ops *mtrr_if;

const struct mtrr_ops *mtrr_if;



static void set_mtrr(unsigned int reg, unsigned long base,

		     unsigned long size, mtrr_type type);



void set_mtrr_ops(struct mtrr_ops *ops)

void set_mtrr_ops(const struct mtrr_ops *ops)

{

	if (ops->vendor && ops->vendor < X86_VENDOR_NUM)

		mtrr_ops[ops->vendor] = ops;