Merge branch 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (883c9ab9) · Commits · 戴 / test

arch/parisc/Kconfig

+3 −3

Original line number	Diff line number	Diff line
		@@ -244,11 +244,11 @@ config PARISC_PAGE_SIZE_4KB

		config PARISC_PAGE_SIZE_16KB
		bool "16KB"
		depends on PA8X00
		depends on PA8X00 && BROKEN

		config PARISC_PAGE_SIZE_64KB
		bool "64KB"
		depends on PA8X00
		depends on PA8X00 && BROKEN

		endchoice

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

		endmenu

arch/parisc/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -65,10 +65,6 @@ endif
		# kernel.
		cflags-y += -mdisable-fpregs

		# Without this, "ld -r" results in .text sections that are too big
		# (> 0x40000) for branches to reach stubs.
		cflags-y += -ffunction-sections

		# Use long jumps instead of long branches (needed if your linker fails to
		# link a too big vmlinux executable). Not enabled for building modules.
		ifdef CONFIG_MLONGCALLS

arch/parisc/include/asm/signal.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -21,14 +21,6 @@ typedef struct {
		unsigned long sig[_NSIG_WORDS];
		} sigset_t;

		#ifndef __KERNEL__
		struct sigaction {
		__sighandler_t sa_handler;
		unsigned long sa_flags;
		sigset_t sa_mask; /* mask last for extensibility */
		};
		#endif

		#include <asm/sigcontext.h>

		#endif /* !__ASSEMBLY */

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -364,8 +364,9 @@
		#define __NR_preadv2 (__NR_Linux + 347)
		#define __NR_pwritev2 (__NR_Linux + 348)
		#define __NR_statx (__NR_Linux + 349)
		#define __NR_io_pgetevents (__NR_Linux + 350)

		#define __NR_Linux_syscalls (__NR_statx + 1)
		#define __NR_Linux_syscalls (__NR_io_pgetevents + 1)


		#define __IGNORE_select /* newselect */

arch/parisc/kernel/drivers.c

+9 −16

Original line number	Diff line number	Diff line
		@@ -155,16 +155,13 @@ int register_parisc_driver(struct parisc_driver *driver)
		/* FIXME: we need this because apparently the sti
		* driver can be registered twice */
		if (driver->drv.name) {
		printk(KERN_WARNING
		"BUG: skipping previously registered driver %s\n",
		pr_warn("BUG: skipping previously registered driver %s\n",
		driver->name);
		return 1;
		}

		if (!driver->probe) {
		printk(KERN_WARNING
		"BUG: driver %s has no probe routine\n",
		driver->name);
		pr_warn("BUG: driver %s has no probe routine\n", driver->name);
		return 1;
		}

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

		dev = create_parisc_device(mod_path);
		if (dev->id.hw_type != HPHW_FAULTY) {
		printk(KERN_ERR "Two devices have hardware path [%s]. "
		"IODC data for second device: "
		"%02x%02x%02x%02x%02x%02x\n"
		pr_err("Two devices have hardware path [%s]. IODC data for second device: %7phN\n"
		"Rearranging GSC cards sometimes helps\n",
		parisc_pathname(dev), iodc_data[0], iodc_data[1],
		iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);
		parisc_pathname(dev), iodc_data);
		return NULL;
		}

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

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

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

Admin message