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

Commit 0f25f2c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 kgdb fixlet from Ingo Molnar:
 "A single debugging related commit: compress the memory usage of a kgdb
  data structure"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kgdb: Replace bool_int_array[NR_CPUS] with bitmap
parents f323c49b 0d44975d

arch/x86/kernel/kgdb.c

+11 −6
Original line number Diff line number Diff line
@@ -511,26 +511,31 @@ single_step_cont(struct pt_regs *regs, struct die_args *args) 
	return NOTIFY_STOP;

}



static int was_in_debug_nmi[NR_CPUS];

static DECLARE_BITMAP(was_in_debug_nmi, NR_CPUS);



static int kgdb_nmi_handler(unsigned int cmd, struct pt_regs *regs)

{

	int cpu;



	switch (cmd) {

	case NMI_LOCAL:

		if (atomic_read(&kgdb_active) != -1) {

			/* KGDB CPU roundup */

			kgdb_nmicallback(raw_smp_processor_id(), regs);

			was_in_debug_nmi[raw_smp_processor_id()] = 1;

			cpu = raw_smp_processor_id();

			kgdb_nmicallback(cpu, regs);

			set_bit(cpu, was_in_debug_nmi);

			touch_nmi_watchdog();



			return NMI_HANDLED;

		}

		break;



	case NMI_UNKNOWN:

		if (was_in_debug_nmi[raw_smp_processor_id()]) {

			was_in_debug_nmi[raw_smp_processor_id()] = 0;

		cpu = raw_smp_processor_id();



		if (__test_and_clear_bit(cpu, was_in_debug_nmi))

			return NMI_HANDLED;

		}



		break;

	default:

		/* do nothing */