Skip to content

Commit 883c9ab

Browse files
torvaldstorvalds
committed
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
2 parents 08af78d + 24b6c22 commit 883c9ab

File tree

7 files changed

+17
-34
lines changed

7 files changed

+17
-34
lines changed

‎arch/parisc/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ config PARISC_PAGE_SIZE_4KB
244244

245245
config PARISC_PAGE_SIZE_16KB
246246
bool "16KB"
247-
depends on PA8X00
247+
depends on PA8X00 && BROKEN
248248

249249
config PARISC_PAGE_SIZE_64KB
250250
bool "64KB"
251-
depends on PA8X00
251+
depends on PA8X00 && BROKEN
252252

253253
endchoice
254254

@@ -347,7 +347,7 @@ config NR_CPUS
347347
int "Maximum number of CPUs (2-32)"
348348
range 2 32
349349
depends on SMP
350-
default "32"
350+
default "4"
351351

352352
endmenu
353353

‎arch/parisc/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ endif
6565
# kernel.
6666
cflags-y += -mdisable-fpregs
6767

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-
7268
# Use long jumps instead of long branches (needed if your linker fails to
7369
# link a too big vmlinux executable). Not enabled for building modules.
7470
ifdef CONFIG_MLONGCALLS

‎arch/parisc/include/asm/signal.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ typedef struct {
2121
unsigned long sig[_NSIG_WORDS];
2222
} sigset_t;
2323

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-
3224
#include <asm/sigcontext.h>
3325

3426
#endif /* !__ASSEMBLY */

‎arch/parisc/include/uapi/asm/unistd.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,9 @@
364364
#define __NR_preadv2 (__NR_Linux + 347)
365365
#define __NR_pwritev2 (__NR_Linux + 348)
366366
#define __NR_statx (__NR_Linux + 349)
367+
#define __NR_io_pgetevents (__NR_Linux + 350)
367368

368-
#define __NR_Linux_syscalls (__NR_statx + 1)
369+
#define __NR_Linux_syscalls (__NR_io_pgetevents + 1)
369370

370371

371372
#define __IGNORE_select /* newselect */

‎arch/parisc/kernel/drivers.c

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,14 @@ int register_parisc_driver(struct parisc_driver *driver)
154154
{
155155
/* FIXME: we need this because apparently the sti
156156
* 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);
161160
return 1;
162161
}
163162

164163
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);
168165
return 1;
169166
}
170167

@@ -491,12 +488,9 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
491488

492489
dev = create_parisc_device(mod_path);
493490
if (dev->id.hw_type != HPHW_FAULTY) {
494-
printk(KERN_ERR "Two devices have hardware path [%s]. "
495-
"IODC data for second device: "
496-
"%02x%02x%02x%02x%02x%02x\n"
497-
"Rearranging GSC cards sometimes helps\n",
498-
parisc_pathname(dev), iodc_data[0], iodc_data[1],
499-
iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);
491+
pr_err("Two devices have hardware path [%s]. IODC data for second device: %7phN\n"
492+
"Rearranging GSC cards sometimes helps\n",
493+
parisc_pathname(dev), iodc_data);
500494
return NULL;
501495
}
502496

@@ -528,8 +522,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
528522
* the keyboard controller
529523
*/
530524
if ((hpa & 0xfff) == 0 && insert_resource(&iomem_resource, &dev->hpa))
531-
printk("Unable to claim HPA %lx for device %s\n",
532-
hpa, name);
525+
pr_warn("Unable to claim HPA %lx for device %s\n", hpa, name);
533526

534527
return dev;
535528
}
@@ -875,7 +868,7 @@ static void print_parisc_device(struct parisc_device *dev)
875868
static int count;
876869

877870
print_pa_hwpath(dev, hw_path);
878-
printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
871+
pr_info("%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",
879872
++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,
880873
dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);
881874

‎arch/parisc/kernel/syscall_table.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@
445445
ENTRY_COMP(preadv2)
446446
ENTRY_COMP(pwritev2)
447447
ENTRY_SAME(statx)
448+
ENTRY_COMP(io_pgetevents) /* 350 */
448449

449450

450451
.ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b))

‎arch/parisc/kernel/unwind.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/* #define DEBUG 1 */
2727
#ifdef DEBUG
28-
#define dbg(x...) printk(x)
28+
#define dbg(x...) pr_debug(x)
2929
#else
3030
#define dbg(x...)
3131
#endif
@@ -182,7 +182,7 @@ int __init unwind_init(void)
182182
start = (long)&__start___unwind[0];
183183
stop = (long)&__stop___unwind[0];
184184

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",
186186
start, stop,
187187
(stop - start) / sizeof(struct unwind_table_entry));
188188

0 commit comments

Comments
 (0)