Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+11
-10
+8
-2
arch/parisc/include/asm/cmpxchg.h
+8
-2
arch/parisc/include/asm/cmpxchg.h
···
44
44
** if (((unsigned long)p & 0xf) == 0)
45
45
** return __ldcw(p);
46
46
*/
47
-
#define xchg(ptr, x) \
48
-
((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
47
+
#define xchg(ptr, x) \
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
56
/* bug catcher for when unsupported size is used - won't link */
51
57
extern void __cmpxchg_called_with_bad_pointer(void);
-4
arch/parisc/include/asm/kexec.h
-4
arch/parisc/include/asm/kexec.h
···
2
2
#ifndef _ASM_PARISC_KEXEC_H
3
3
#define _ASM_PARISC_KEXEC_H
4
4
5
-
#ifdef CONFIG_KEXEC
6
-
7
5
/* Maximum physical address we can use pages from */
8
6
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
9
7
/* Maximum address we can reach in physical address mode */
···
29
31
}
30
32
31
33
#endif /* __ASSEMBLY__ */
32
-
33
-
#endif /* CONFIG_KEXEC */
34
34
35
35
#endif /* _ASM_PARISC_KEXEC_H */
+1
-1
arch/parisc/kernel/Makefile
+1
-1
arch/parisc/kernel/Makefile
+1
-1
arch/parisc/kernel/drivers.c
+1
-1
arch/parisc/kernel/drivers.c
···
810
810
static void walk_native_bus(unsigned long io_io_low, unsigned long io_io_high,
811
811
struct device *parent);
812
812
813
-
static void walk_lower_bus(struct parisc_device *dev)
813
+
static void __init walk_lower_bus(struct parisc_device *dev)
814
814
{
815
815
unsigned long io_io_low, io_io_high;
816
816
+1
-2
arch/parisc/kernel/pdt.c
+1
-2
arch/parisc/kernel/pdt.c
···
327
327
((pde & PDT_ADDR_SINGLE_ERR) == 0))
328
328
memory_failure(pde >> PAGE_SHIFT, 0);
329
329
else
330
-
soft_offline_page(
331
-
pfn_to_page(pde >> PAGE_SHIFT), 0);
330
+
soft_offline_page(pde >> PAGE_SHIFT, 0);
332
331
#else
333
332
pr_crit("PDT: memory error at 0x%lx ignored.\n"
334
333
"Rebuild kernel with CONFIG_MEMORY_FAILURE=y "