Commit f0c5f7ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.0-2' of... 

Merge tag 'loongarch-fixes-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "Fix several build errors or warnings, cleanup some code, and adjust
  arch_do_signal_or_restart() to adapt generic entry"

* tag 'loongarch-fixes-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: mm: Remove the unneeded result variable
  LoongArch: Fix arch_remove_memory() undefined build error
  LoongArch: Fix section mismatch due to acpi_os_ioremap()
  LoongArch: Improve dump_tlb() output messages
  LoongArch: Adjust arch_do_signal_or_restart() to adapt generic entry
  LoongArch: Avoid orphan input sections
parents cda9a848 ac9284db

arch/loongarch/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ config LOONGARCH 
	select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPTION

	select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION

	select ARCH_KEEP_MEMBLOCK

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_SPARSEMEM_ENABLE
@@ -51,6 +52,7 @@ config LOONGARCH 
	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT

	select ARCH_WANT_LD_ORPHAN_WARN

	select ARCH_WANTS_NO_INSTR

	select BUILDTIME_TABLE_SORT

	select COMMON_CLK

arch/loongarch/include/asm/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern int acpi_pci_disabled; 
extern int acpi_noirq;



#define acpi_os_ioremap acpi_os_ioremap

void __init __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size);

void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size);



static inline void disable_acpi(void)

{

arch/loongarch/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size) 
	early_memunmap(map, size);

}



void __init __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)

void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)

{

	if (!memblock_is_memory(phys))

		return ioremap(phys, size);

arch/loongarch/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -529,11 +529,11 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) 
	signal_setup_done(ret, ksig, 0);

}



void arch_do_signal_or_restart(struct pt_regs *regs, bool has_signal)

void arch_do_signal_or_restart(struct pt_regs *regs)

{

	struct ksignal ksig;



	if (has_signal && get_signal(&ksig)) {

	if (get_signal(&ksig)) {

		/* Whee!  Actually deliver the signal.	*/

		handle_signal(&ksig, regs);

		return;

arch/loongarch/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ SECTIONS 
	PERCPU_SECTION(1 << CONFIG_L1_CACHE_SHIFT)

#endif



	.rela.dyn : ALIGN(8) { *(.rela.dyn) *(.rela*) }



	.init.bss : {

		*(.init.bss)

	}