diff options
Diffstat (limited to 'queue-6.6/scripts-clean-up-ia-64-code.patch')
| -rw-r--r-- | queue-6.6/scripts-clean-up-ia-64-code.patch | 163 |
1 files changed, 163 insertions, 0 deletions
diff --git a/queue-6.6/scripts-clean-up-ia-64-code.patch b/queue-6.6/scripts-clean-up-ia-64-code.patch new file mode 100644 index 0000000000..14cbd945fc --- /dev/null +++ b/queue-6.6/scripts-clean-up-ia-64-code.patch @@ -0,0 +1,163 @@ +From 0df8e97085946dd79c06720678a845778b6d6bf8 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <masahiroy@kernel.org> +Date: Fri, 24 Nov 2023 23:09:08 +0900 +Subject: scripts: clean up IA-64 code + +From: Masahiro Yamada <masahiroy@kernel.org> + +commit 0df8e97085946dd79c06720678a845778b6d6bf8 upstream. + +A little more janitorial work after commit cf8e8658100d ("arch: Remove +Itanium (IA-64) architecture"). + +Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> +Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> +Signed-off-by: Chuck Lever <chuck.lever@oracle.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + scripts/checkstack.pl | 3 --- + scripts/gdb/linux/tasks.py | 15 +++------------ + scripts/head-object-list.txt | 1 - + scripts/kconfig/mconf.c | 2 +- + scripts/kconfig/nconf.c | 2 +- + scripts/package/kernel.spec | 6 ------ + scripts/package/mkdebian | 2 +- + scripts/recordmcount.c | 1 - + scripts/recordmcount.pl | 7 ------- + scripts/xz_wrap.sh | 1 - + 10 files changed, 6 insertions(+), 34 deletions(-) + +--- a/scripts/checkstack.pl ++++ b/scripts/checkstack.pl +@@ -68,9 +68,6 @@ my (@stack, $re, $dre, $sub, $x, $xs, $f + # 2f60: 48 81 ec e8 05 00 00 sub $0x5e8,%rsp + $re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%(e|r)sp$/o; + $dre = qr/^.*[as][du][db] (%.*),\%(e|r)sp$/o; +- } elsif ($arch eq 'ia64') { +- #e0000000044011fc: 01 0f fc 8c adds r12=-384,r12 +- $re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o; + } elsif ($arch eq 'm68k') { + # 2b6c: 4e56 fb70 linkw %fp,#-1168 + # 1df770: defc ffe4 addaw #-28,%sp +--- a/scripts/gdb/linux/tasks.py ++++ b/scripts/gdb/linux/tasks.py +@@ -86,21 +86,12 @@ LxPs() + + thread_info_type = utils.CachedType("struct thread_info") + +-ia64_task_size = None +- + + def get_thread_info(task): + thread_info_ptr_type = thread_info_type.get_type().pointer() +- if utils.is_target_arch("ia64"): +- global ia64_task_size +- if ia64_task_size is None: +- ia64_task_size = gdb.parse_and_eval("sizeof(struct task_struct)") +- thread_info_addr = task.address + ia64_task_size +- thread_info = thread_info_addr.cast(thread_info_ptr_type) +- else: +- if task.type.fields()[0].type == thread_info_type.get_type(): +- return task['thread_info'] +- thread_info = task['stack'].cast(thread_info_ptr_type) ++ if task.type.fields()[0].type == thread_info_type.get_type(): ++ return task['thread_info'] ++ thread_info = task['stack'].cast(thread_info_ptr_type) + return thread_info.dereference() + + +--- a/scripts/head-object-list.txt ++++ b/scripts/head-object-list.txt +@@ -17,7 +17,6 @@ arch/arm/kernel/head-nommu.o + arch/arm/kernel/head.o + arch/csky/kernel/head.o + arch/hexagon/kernel/head.o +-arch/ia64/kernel/head.o + arch/loongarch/kernel/head.o + arch/m68k/68000/head.o + arch/m68k/coldfire/head.o +--- a/scripts/kconfig/mconf.c ++++ b/scripts/kconfig/mconf.c +@@ -247,7 +247,7 @@ search_help[] = + " -> PCI support (PCI [=y])\n" + "(1) -> PCI access mode (<choice> [=y])\n" + " Defined at drivers/pci/Kconfig:47\n" +- " Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" ++ " Depends on: X86_LOCAL_APIC && X86_IO_APIC\n" + " Selects: LIBCRC32\n" + " Selected by: BAR [=n]\n" + "-----------------------------------------------------------------\n" +--- a/scripts/kconfig/nconf.c ++++ b/scripts/kconfig/nconf.c +@@ -216,7 +216,7 @@ search_help[] = + "Symbol: FOO [ = m]\n" + "Prompt: Foo bus is used to drive the bar HW\n" + "Defined at drivers/pci/Kconfig:47\n" +-"Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" ++"Depends on: X86_LOCAL_APIC && X86_IO_APIC\n" + "Location:\n" + " -> Bus options (PCI, PCMCIA, EISA, ISA)\n" + " -> PCI support (PCI [ = y])\n" +--- a/scripts/package/kernel.spec ++++ b/scripts/package/kernel.spec +@@ -56,13 +56,7 @@ patch -p1 < %{SOURCE2} + + %install + mkdir -p %{buildroot}/boot +-%ifarch ia64 +-mkdir -p %{buildroot}/boot/efi +-cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/efi/vmlinuz-%{KERNELRELEASE} +-ln -s efi/vmlinuz-%{KERNELRELEASE} %{buildroot}/boot/ +-%else + cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE} +-%endif + %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install + %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install + cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE} +--- a/scripts/package/mkdebian ++++ b/scripts/package/mkdebian +@@ -26,7 +26,7 @@ set_debarch() { + + # Attempt to find the correct Debian architecture + case "$UTS_MACHINE" in +- i386|ia64|alpha|m68k|riscv*) ++ i386|alpha|m68k|riscv*) + debarch="$UTS_MACHINE" ;; + x86_64) + debarch=amd64 ;; +--- a/scripts/recordmcount.c ++++ b/scripts/recordmcount.c +@@ -590,7 +590,6 @@ static int do_file(char const *const fna + ideal_nop = ideal_nop4_arm64; + is_fake_mcount64 = arm64_is_fake_mcount; + break; +- case EM_IA_64: reltype = R_IA64_IMM64; break; + case EM_MIPS: /* reltype: e_class */ break; + case EM_LOONGARCH: /* reltype: e_class */ break; + case EM_PPC: reltype = R_PPC_ADDR32; break; +--- a/scripts/recordmcount.pl ++++ b/scripts/recordmcount.pl +@@ -275,13 +275,6 @@ if ($arch eq "x86_64") { + $section_type = '%progbits'; + $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_AARCH64_CALL26\\s+_mcount\$"; + $type = ".quad"; +-} elsif ($arch eq "ia64") { +- $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; +- $type = "data8"; +- +- if ($is_module eq "0") { +- $cc .= " -mconstant-gp"; +- } + } elsif ($arch eq "sparc64") { + # In the objdump output there are giblets like: + # 0000000000000000 <igmp_net_exit-0x18>: +--- a/scripts/xz_wrap.sh ++++ b/scripts/xz_wrap.sh +@@ -15,7 +15,6 @@ LZMA2OPTS= + case $SRCARCH in + x86) BCJ=--x86 ;; + powerpc) BCJ=--powerpc ;; +- ia64) BCJ=--ia64; LZMA2OPTS=pb=4 ;; + arm) BCJ=--arm ;; + sparc) BCJ=--sparc ;; + esac |