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

Commit 7e3cbc3f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/ptrace' into x86/tsc 

Conflicts:
	arch/x86/kernel/cpu/intel.c
parents 345077cd f4166c54

arch/x86/kernel/cpu/intel.c

+1 −2
Original line number Diff line number Diff line
@@ -324,12 +324,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) 
		set_cpu_cap(c, X86_FEATURE_P4);

	if (c->x86 == 6)

		set_cpu_cap(c, X86_FEATURE_P3);

#endif



	if (cpu_has_bts)

		ptrace_bts_init_intel(c);



#endif



	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {

		/*

		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology

arch/x86/kernel/ds.c

+4 −5
Original line number Diff line number Diff line
@@ -847,17 +847,16 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) 
	switch (c->x86) {

	case 0x6:

		switch (c->x86_model) {

		case 0 ... 0xC:

			/* sorry, don't know about them */

			break;

		case 0xD:

		case 0xE: /* Pentium M */

			ds_configure(&ds_cfg_var);

			break;

		case 0xF: /* Core2 */

		case 0x1C: /* Atom */

		default: /* Core2, Atom, ... */

			ds_configure(&ds_cfg_64);

			break;

		default:

			/* sorry, don't know about them */

			break;

		}

		break;

	case 0xF:

arch/x86/kernel/ptrace.c

+4 −5
Original line number Diff line number Diff line
@@ -929,17 +929,16 @@ void __cpuinit ptrace_bts_init_intel(struct cpuinfo_x86 *c) 
	switch (c->x86) {

	case 0x6:

		switch (c->x86_model) {

		case 0 ... 0xC:

			/* sorry, don't know about them */

			break;

		case 0xD:

		case 0xE: /* Pentium M */

			bts_configure(&bts_cfg_pentium_m);

			break;

		case 0xF: /* Core2 */

        case 0x1C: /* Atom */

		default: /* Core2, Atom, ... */

			bts_configure(&bts_cfg_core2);

			break;

		default:

			/* sorry, don't know about them */

			break;

		}

		break;

	case 0xF: