Inter-revision diff: patch 6

Comparing v3 (message) to v4 (message) 

--- v3
+++ v4
@@ -57,7 +57,7 @@
  };
  
 diff --git a/arch/x86/kernel/idt.c b/arch/x86/kernel/idt.c
-index 01adea278a71..2d02fdd599a2 100644
+index 01adea278a71..66ebc8cb16e2 100644
 --- a/arch/x86/kernel/idt.c
 +++ b/arch/x86/kernel/idt.c
 @@ -104,6 +104,10 @@ static const __initconst struct idt_data def_idts[] = {
@@ -65,14 +65,14 @@
  	SYSG(IA32_SYSCALL_VECTOR,	entry_INT80_32),
  #endif
 +
-+#ifdef CONFIG_X86_INTEL_CET
++#ifdef CONFIG_X86_64
 +	INTG(X86_TRAP_CP,		control_protection),
 +#endif
  };
  
  /*
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index e6db475164ed..21a713b96148 100644
+index e6db475164ed..873765adc244 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
 @@ -578,6 +578,64 @@ do_general_protection(struct pt_regs *regs, long error_code)
@@ -129,7 +129,7 @@
 +			tsk->comm, task_pid_nr(tsk),
 +			regs->ip, regs->sp, error_code,
 +			control_protection_err[error_code]);
-+		print_vma_addr(" in ", regs->ip);
++		print_vma_addr(KERN_CONT " in ", regs->ip);
 +		pr_cont("\n");
 +	}
 +
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help