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

Commit ee799f41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 platform change from Ingo Molnar:
 "An Intel Quark SoC fix"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/quark: Run IMR self-test on IMR capble hw only
parents 6cf78d4b a6fcb6d4

arch/x86/platform/intel-quark/imr_selftest.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

 */





#include <asm-generic/sections.h>

#include <asm-generic/sections.h>

#include <asm/cpu_device_id.h>

#include <asm/imr.h>

#include <asm/imr.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/mm.h>
@@ -101,6 +102,12 @@ static void __init imr_self_test(void) 
	}

	}

}

}





static const struct x86_cpu_id imr_ids[] __initconst = {

	{ X86_VENDOR_INTEL, 5, 9 },	/* Intel Quark SoC X1000. */

	{}

};

MODULE_DEVICE_TABLE(x86cpu, imr_ids);



/**

/**

 * imr_self_test_init - entry point for IMR driver.

 * imr_self_test_init - entry point for IMR driver.

 *

 *
@@ -108,6 +115,7 @@ static void __init imr_self_test(void) 
 */

 */

static int __init imr_self_test_init(void)

static int __init imr_self_test_init(void)

{

{

	if (x86_match_cpu(imr_ids))

		imr_self_test();

		imr_self_test();

	return 0;

	return 0;

}

}