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

Merge branch 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pul parisc fixes from Helge Deller:
 "Two build error fixes, one for the soft_offline_page() parameter
  change and one for a specific KEXEC/KEXEC_FILE configuration, as well
  as a compiler and a linker warning fix"

* 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix compiler warnings in debug_core.c
  parisc: soft_offline_page() now takes the pfn
  parisc: add missing __init annotation
  parisc: fix compilation when KEXEC=n and KEXEC_FILE=y
parents 62af608b 75cf9797

arch/parisc/include/asm/cmpxchg.h

+8 −2
Original line number Diff line number Diff line
@@ -45,7 +45,13 @@ __xchg(unsigned long x, __volatile__ void *ptr, int size) 
**			return __ldcw(p);

*/

#define xchg(ptr, x)							\

	((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))

({									\

	__typeof__(*(ptr)) __ret;					\

	__typeof__(*(ptr)) _x_ = (x);					\

	__ret = (__typeof__(*(ptr)))					\

		__xchg((unsigned long)_x_, (ptr), sizeof(*(ptr)));	\

	__ret;								\

})



/* bug catcher for when unsupported size is used - won't link */

extern void __cmpxchg_called_with_bad_pointer(void);

arch/parisc/include/asm/kexec.h

+0 −4
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _ASM_PARISC_KEXEC_H

#define _ASM_PARISC_KEXEC_H



#ifdef CONFIG_KEXEC



/* Maximum physical address we can use pages from */

#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)

/* Maximum address we can reach in physical address mode */
@@ -32,6 +30,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 


#endif /* __ASSEMBLY__ */



#endif /* CONFIG_KEXEC */



#endif /* _ASM_PARISC_KEXEC_H */

arch/parisc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,5 +37,5 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o 
obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o

obj-$(CONFIG_KGDB)			+= kgdb.o

obj-$(CONFIG_KPROBES)			+= kprobes.o

obj-$(CONFIG_KEXEC)			+= kexec.o relocate_kernel.o

obj-$(CONFIG_KEXEC_CORE)		+= kexec.o relocate_kernel.o

obj-$(CONFIG_KEXEC_FILE)		+= kexec_file.o

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ EXPORT_SYMBOL(device_to_hwpath); 
static void walk_native_bus(unsigned long io_io_low, unsigned long io_io_high,

                            struct device *parent);



static void walk_lower_bus(struct parisc_device *dev)

static void __init walk_lower_bus(struct parisc_device *dev)

{

	unsigned long io_io_low, io_io_high;

arch/parisc/kernel/pdt.c

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ static int pdt_mainloop(void *unused) 
			    ((pde & PDT_ADDR_SINGLE_ERR) == 0))

				memory_failure(pde >> PAGE_SHIFT, 0);

			else

				soft_offline_page(

					pfn_to_page(pde >> PAGE_SHIFT), 0);

				soft_offline_page(pde >> PAGE_SHIFT, 0);

#else

			pr_crit("PDT: memory error at 0x%lx ignored.\n"

				"Rebuild kernel with CONFIG_MEMORY_FAILURE=y "

CRA Git | Maintained and supported by SUSTech CRA and CCSE