Commit cc863973 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "This patcheset includes fixes for:

   - the PCI/LBA which brings back the stifb graphics framebuffer
     console
   - possible memory overflows in parisc kernel init code
   - parport support on older GSC machines
   - avoids that users by mistake enable PARPORT_PC_SUPERIO on parisc
   - MAINTAINERS file list updates for parisc."

* 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: parport0: fix this legacy no-device port driver!
  parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
  parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
  parisc/PCI: Set type for LBA bus_num resource
  MAINTAINERS: update parisc architecture file list
  parisc: kernel: using strlcpy() instead of strcpy()
  parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
  parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
  parisc: memory overflow, 'name' length is too short for using
parents aa3ae6de 4edb3869

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6088,7 +6088,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git

S:	Maintained

F:	arch/parisc/

F:	Documentation/parisc/

F:	drivers/parisc/

F:	drivers/char/agp/parisc-agp.c

F:	drivers/input/serio/gscps2.c

F:	drivers/parport/parport_gsc.*

F:	drivers/tty/serial/8250/8250_gsc.c

F:	drivers/video/sti*

F:	drivers/video/console/sti*

F:	drivers/video/logo/logo_parisc*



PC87360 HARDWARE MONITORING DRIVER

M:	Jim Cromie <jim.cromie@gmail.com>

arch/parisc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ KBUILD_CFLAGS_KERNEL += -mlong-calls 
endif



# select which processor to optimise for

cflags-$(CONFIG_PA7100)		+= -march=1.1 -mschedule=7100

cflags-$(CONFIG_PA7000)		+= -march=1.1 -mschedule=7100

cflags-$(CONFIG_PA7200)		+= -march=1.1 -mschedule=7200

cflags-$(CONFIG_PA7100LC)	+= -march=1.1 -mschedule=7100LC

cflags-$(CONFIG_PA7300LC)	+= -march=1.1 -mschedule=7300

arch/parisc/include/asm/mmzone.h

+1 −4
Original line number Diff line number Diff line
@@ -39,17 +39,14 @@ extern unsigned char pfnnid_map[PFNNID_MAP_MAX]; 
static inline int pfn_to_nid(unsigned long pfn)

{

	unsigned int i;

	unsigned char r;



	if (unlikely(pfn_is_io(pfn)))

		return 0;



	i = pfn >> PFNNID_SHIFT;

	BUG_ON(i >= ARRAY_SIZE(pfnnid_map));

	r = pfnnid_map[i];

	BUG_ON(r == 0xff);



	return (int)r;

	return (int)pfnnid_map[i];

}



static inline int pfn_valid(int pfn)

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ EXPORT_SYMBOL(print_pci_hwpath); 
static void setup_bus_id(struct parisc_device *padev)

{

	struct hardware_path path;

	char name[20];

	char name[28];

	char *output = name;

	int i;

arch/parisc/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ void __init setup_cmdline(char **cmdline_p) 
		/* called from hpux boot loader */

		boot_command_line[0] = '\0';

	} else {

		strcpy(boot_command_line, (char *)__va(boot_args[1]));

		strlcpy(boot_command_line, (char *)__va(boot_args[1]),

			COMMAND_LINE_SIZE);



#ifdef CONFIG_BLK_DEV_INITRD

		if (boot_args[2] != 0) /* did palo pass us a ramdisk? */

CRA Git | Maintained and supported by SUSTech CRA and CCSE