Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision e16e2ba4cefaadd4b2bb61faaa6b4e88b7e8f9d7)
+++ kernel/generic/include/lib/elf.h	(revision 74e6b1fc662aac7baccba209e10b859ffaabde8c)
@@ -327,8 +327,15 @@
 	elf_word type;
 };
+/*
+ * NOTE: namesz, descsz and type should be 64-bits wide (elf_xword)
+ * per the 64-bit ELF spec. The Linux kernel however screws up and
+ * defines them as Elf64_Word, which is 32-bits wide(!). We are trying
+ * to make our core files compatible with Linux GDB target so we copy
+ * the blunder here.
+ */
 struct elf64_note {
-	elf_xword namesz;
-	elf_xword descsz;
-	elf_xword type;
+	elf_word namesz;
+	elf_word descsz;
+	elf_word type;
 };