History

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

Linus Torvalds committed 6 years ago

Commit 62104692 parents 62af608 75cf9795 files · +11 −10Browse files

Unified · Split

5 files
  1. arch/parisc/include/asm/cmpxchg.h +8 −2
  2. arch/parisc/include/asm/kexec.h +0 −4
  3. arch/parisc/kernel/Makefile +1 −1
  4. arch/parisc/kernel/drivers.c +1 −1
  5. arch/parisc/kernel/pdt.c +1 −2
arch/parisc/include/asm/cmpxchg.h+8−2
@@ -44,8 +44,14 @@ __xchg(unsigned long x, __volatile__ void *ptr, int size) · 43 unmodified lines
44** if (((unsigned long)p & 0xf) == 0)44** if (((unsigned long)p & 0xf) == 0)
45** return __ldcw(p);45** return __ldcw(p);
46*/46*/
47#define xchg(ptr, x) \47#define xchg(ptr, x) \
48 ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))48({ \
49 __typeof__(*(ptr)) __ret; \
50 __typeof__(*(ptr)) _x_ = (x); \
51 __ret = (__typeof__(*(ptr))) \
52 __xchg((unsigned long)_x_, (ptr), sizeof(*(ptr))); \
53 __ret; \
54})
49 55
50/* bug catcher for when unsupported size is used - won't link */56/* bug catcher for when unsupported size is used - won't link */
51extern void __cmpxchg_called_with_bad_pointer(void);57extern void __cmpxchg_called_with_bad_pointer(void);
arch/parisc/include/asm/kexec.h+0−4
@@ -2,8 +2,6 @@ · 1 unmodified line
2#ifndef _ASM_PARISC_KEXEC_H2#ifndef _ASM_PARISC_KEXEC_H
3#define _ASM_PARISC_KEXEC_H3#define _ASM_PARISC_KEXEC_H
4 4
5#ifdef CONFIG_KEXEC
6
7/* Maximum physical address we can use pages from */5/* Maximum physical address we can use pages from */
8#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)6#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
9/* Maximum address we can reach in physical address mode */7/* Maximum address we can reach in physical address mode */
@@ -32,6 +30,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs, · 22 unmodified lines
32 30
33#endif /* __ASSEMBLY__ */31#endif /* __ASSEMBLY__ */
34 32
35#endif /* CONFIG_KEXEC */
36
37#endif /* _ASM_PARISC_KEXEC_H */33#endif /* _ASM_PARISC_KEXEC_H */
arch/parisc/kernel/Makefile+1−1
@@ -37,5 +37,5 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o · 36 unmodified lines
37obj-$(CONFIG_JUMP_LABEL) += jump_label.o37obj-$(CONFIG_JUMP_LABEL) += jump_label.o
38obj-$(CONFIG_KGDB) += kgdb.o38obj-$(CONFIG_KGDB) += kgdb.o
39obj-$(CONFIG_KPROBES) += kprobes.o39obj-$(CONFIG_KPROBES) += kprobes.o
40obj-$(CONFIG_KEXEC) += kexec.o relocate_kernel.o40obj-$(CONFIG_KEXEC_CORE) += kexec.o relocate_kernel.o
41obj-$(CONFIG_KEXEC_FILE) += kexec_file.o41obj-$(CONFIG_KEXEC_FILE) += kexec_file.o
arch/parisc/kernel/drivers.c+1−1
@@ -810,7 +810,7 @@ EXPORT_SYMBOL(device_to_hwpath); · 809 unmodified lines
810static void walk_native_bus(unsigned long io_io_low, unsigned long io_io_high,810static void walk_native_bus(unsigned long io_io_low, unsigned long io_io_high,
811 struct device *parent);811 struct device *parent);
812 812
813static void walk_lower_bus(struct parisc_device *dev)813static void __init walk_lower_bus(struct parisc_device *dev)
814{814{
815 unsigned long io_io_low, io_io_high;815 unsigned long io_io_low, io_io_high;
816 816
arch/parisc/kernel/pdt.c+1−2
@@ -327,8 +327,7 @@ static int pdt_mainloop(void *unused) · 326 unmodified lines
327 ((pde & PDT_ADDR_SINGLE_ERR) == 0))327 ((pde & PDT_ADDR_SINGLE_ERR) == 0))
328 memory_failure(pde >> PAGE_SHIFT, 0);328 memory_failure(pde >> PAGE_SHIFT, 0);
329 else329 else
330 soft_offline_page(330 soft_offline_page(pde >> PAGE_SHIFT, 0);
331 pfn_to_page(pde >> PAGE_SHIFT), 0);
332#else331#else
333 pr_crit("PDT: memory error at 0x%lx ignored.\n"332 pr_crit("PDT: memory error at 0x%lx ignored.\n"
334 "Rebuild kernel with CONFIG_MEMORY_FAILURE=y "333 "Rebuild kernel with CONFIG_MEMORY_FAILURE=y "

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t