Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes and cleanups from Helge Deller:
"Nothing exiting in this patchset, just
- small cleanups of header files
- default to 4 CPUs when building a SMP kernel
- mark 16kB and 64kB page sizes broken
- addition of the new io_pgetevents syscall"
* 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Build kernel without -ffunction-sections
parisc: Reduce debug output in unwind code
parisc: Wire up io_pgetevents syscall
parisc: Default to 4 SMP CPUs
parisc: Convert printk(KERN_LEVEL) to pr_lvl()
parisc: Mark 16kB and 64kB page sizes BROKEN
parisc: Drop struct sigaction from not exported header file
+17
-34
+3
-3
arch/parisc/Kconfig
+3
-3
arch/parisc/Kconfig
···
244
244
245
245
config PARISC_PAGE_SIZE_16KB
246
246
bool "16KB"
247
-
depends on PA8X00
247
+
depends on PA8X00 && BROKEN
248
248
249
249
config PARISC_PAGE_SIZE_64KB
250
250
bool "64KB"
251
-
depends on PA8X00
251
+
depends on PA8X00 && BROKEN
252
252
253
253
endchoice
254
254
···
347
347
int "Maximum number of CPUs (2-32)"
348
348
range 2 32
349
349
depends on SMP
350
-
default "32"
350
+
default "4"
351
351
352
352
endmenu
353
353
-4
arch/parisc/Makefile
-4
arch/parisc/Makefile
···
65
65
# kernel.
66
66
cflags-y += -mdisable-fpregs
67
67
68
-
# Without this, "ld -r" results in .text sections that are too big
69
-
# (> 0x40000) for branches to reach stubs.
70
-
cflags-y += -ffunction-sections
71
-
72
68
# Use long jumps instead of long branches (needed if your linker fails to
73
69
# link a too big vmlinux executable). Not enabled for building modules.
74
70
ifdef CONFIG_MLONGCALLS
-8
arch/parisc/include/asm/signal.h
-8
arch/parisc/include/asm/signal.h
···
21
21
unsigned long sig[_NSIG_WORDS];
22
22
} sigset_t;
23
23
24
-
#ifndef __KERNEL__
25
-
struct sigaction {
26
-
__sighandler_t sa_handler;
27
-
unsigned long sa_flags;
28
-
sigset_t sa_mask; /* mask last for extensibility */
29
-
};
30
-
#endif
31
-
32
24
#include <asm/sigcontext.h>
33
25
34
26
#endif /* !__ASSEMBLY */
+2
-1
arch/parisc/include/uapi/asm/unistd.h
+2
-1
arch/parisc/include/uapi/asm/unistd.h
···
364
364
#define __NR_preadv2 (__NR_Linux + 347)
365
365
#define __NR_pwritev2 (__NR_Linux + 348)
366
366
#define __NR_statx (__NR_Linux + 349)
367
+
#define __NR_io_pgetevents (__NR_Linux + 350)
367
368
368
-
#define __NR_Linux_syscalls (__NR_statx + 1)
369
+
#define __NR_Linux_syscalls (__NR_io_pgetevents + 1)
369
370
370
371
371
372
#define __IGNORE_select /* newselect */
+9
-16
arch/parisc/kernel/drivers.c
+9
-16
arch/parisc/kernel/drivers.c
···
154
154
{
155
155
/* FIXME: we need this because apparently the sti
156
156
* driver can be registered twice */
157
-
if(driver->drv.name) {
158
-
printk(KERN_WARNING
159
-
"BUG: skipping previously registered driver %s\n",
160
-
driver->name);
157
+
if (driver->drv.name) {
158
+
pr_warn("BUG: skipping previously registered driver %s\n",
159
+
driver->name);
161
160
return 1;
162
161
}
163
162
164
163
if (!driver->probe) {
165
-
printk(KERN_WARNING
166
-
"BUG: driver %s has no probe routine\n",
167
-
driver->name);
164
+
pr_warn("BUG: driver %s has no probe routine\n", driver->name);
168
165
return 1;
169
166
}
170
167
···
488
491
489
492
dev = create_parisc_device(mod_path);
490
493
if (dev->id.hw_type != HPHW_FAULTY) {
491
-
printk(KERN_ERR "Two devices have hardware path [%s]. "
492
-
"IODC data for second device: "
493
-
"%02x%02x%02x%02x%02x%02x\n"
494
-
"Rearranging GSC cards sometimes helps\n",
495
-
parisc_pathname(dev), iodc_data[0], iodc_data[1],
496
-
iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);
494
+
pr_err("Two devices have hardware path [%s]. IODC data for second device: %7phN\n"
495
+
"Rearranging GSC cards sometimes helps\n",
496
+
parisc_pathname(dev), iodc_data);
497
497
return NULL;
498
498
}
499
499
···
522
528
* the keyboard controller
523
529
*/
524
530
if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))
525
-
printk("Unable to claim HPA %lx for device %s\n",
526
-
hpa, name);
531
+
pr_warn("Unable to claim HPA %lx for device %s\n", hpa, name);
527
532
528
533
return dev;
529
534
}
···
868
875
static int count;
869
876
870
877
print_pa_hwpath(dev, hw_path);
871
-
printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
878
+
pr_info("%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
872
879
++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
873
880
dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
874
881
+1
arch/parisc/kernel/syscall_table.S
+1
arch/parisc/kernel/syscall_table.S
+2
-2
arch/parisc/kernel/unwind.c
+2
-2
arch/parisc/kernel/unwind.c
···
25
25
26
26
/* #define DEBUG 1 */
27
27
#ifdef DEBUG
28
-
#define dbg(x...) printk(x)
28
+
#define dbg(x...) pr_debug(x)
29
29
#else
30
30
#define dbg(x...)
31
31
#endif
···
182
182
start = (long)&__start___unwind[0];
183
183
stop = (long)&__stop___unwind[0];
184
184
185
-
printk("unwind_init: start = 0x%lx, end = 0x%lx, entries = %lu\n",
185
+
dbg("unwind_init: start = 0x%lx, end = 0x%lx, entries = %lu\n",
186
186
start, stop,
187
187
(stop - start) / sizeof(struct unwind_table_entry));
188
188