Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+23
-16
+8
MAINTAINERS
+8
MAINTAINERS
···
6088
6088
T: git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
6089
6089
S: Maintained
6090
6090
F: arch/parisc/
6091
+
F: Documentation/parisc/
6091
6092
F: drivers/parisc/
6093
+
F: drivers/char/agp/parisc-agp.c
6094
+
F: drivers/input/serio/gscps2.c
6095
+
F: drivers/parport/parport_gsc.*
6096
+
F: drivers/tty/serial/8250/8250_gsc.c
6097
+
F: drivers/video/sti*
6098
+
F: drivers/video/console/sti*
6099
+
F: drivers/video/logo/logo_parisc*
6092
6100
6093
6101
PC87360 HARDWARE MONITORING DRIVER
6094
6102
M: Jim Cromie <jim.cromie@gmail.com>
+1
-1
arch/parisc/Makefile
+1
-1
arch/parisc/Makefile
···
66
66
endif
67
67
68
68
# select which processor to optimise for
69
-
cflags-$(CONFIG_PA7100) += -march=1.1 -mschedule=7100
69
+
cflags-$(CONFIG_PA7000) += -march=1.1 -mschedule=7100
70
70
cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200
71
71
cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC
72
72
cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300
+1
-4
arch/parisc/include/asm/mmzone.h
+1
-4
arch/parisc/include/asm/mmzone.h
···
39
39
static inline int pfn_to_nid(unsigned long pfn)
40
40
{
41
41
unsigned int i;
42
-
unsigned char r;
43
42
44
43
if (unlikely(pfn_is_io(pfn)))
45
44
return 0;
46
45
47
46
i = pfn >> PFNNID_SHIFT;
48
47
BUG_ON(i >= ARRAY_SIZE(pfnnid_map));
49
-
r = pfnnid_map[i];
50
-
BUG_ON(r == 0xff);
51
48
52
-
return (int)r;
49
+
return (int)pfnnid_map[i];
53
50
}
54
51
55
52
static inline int pfn_valid(int pfn)
+1
-1
arch/parisc/kernel/drivers.c
+1
-1
arch/parisc/kernel/drivers.c
+2
-1
arch/parisc/kernel/setup.c
+2
-1
arch/parisc/kernel/setup.c
···
69
69
/* called from hpux boot loader */
70
70
boot_command_line[0] = '\0';
71
71
} else {
72
-
strcpy(boot_command_line, (char *)__va(boot_args[1]));
72
+
strlcpy(boot_command_line, (char *)__va(boot_args[1]),
73
+
COMMAND_LINE_SIZE);
73
74
74
75
#ifdef CONFIG_BLK_DEV_INITRD
75
76
if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
+5
-4
drivers/parisc/lba_pci.c
+5
-4
drivers/parisc/lba_pci.c
···
668
668
BUG();
669
669
}
670
670
671
-
if (ldev->hba.elmmio_space.start) {
671
+
if (ldev->hba.elmmio_space.flags) {
672
672
err = request_resource(&iomem_resource,
673
673
&(ldev->hba.elmmio_space));
674
674
if (err < 0) {
···
993
993
994
994
case PAT_LMMIO:
995
995
/* used to fix up pre-initialized MEM BARs */
996
-
if (!lba_dev->hba.lmmio_space.start) {
996
+
if (!lba_dev->hba.lmmio_space.flags) {
997
997
sprintf(lba_dev->hba.lmmio_name,
998
998
"PCI%02x LMMIO",
999
999
(int)lba_dev->hba.bus_num.start);
···
1001
1001
io->start;
1002
1002
r = &lba_dev->hba.lmmio_space;
1003
1003
r->name = lba_dev->hba.lmmio_name;
1004
-
} else if (!lba_dev->hba.elmmio_space.start) {
1004
+
} else if (!lba_dev->hba.elmmio_space.flags) {
1005
1005
sprintf(lba_dev->hba.elmmio_name,
1006
1006
"PCI%02x ELMMIO",
1007
1007
(int)lba_dev->hba.bus_num.start);
···
1096
1096
r->name = "LBA PCI Busses";
1097
1097
r->start = lba_num & 0xff;
1098
1098
r->end = (lba_num>>8) & 0xff;
1099
+
r->flags = IORESOURCE_BUS;
1099
1100
1100
1101
/* Set up local PCI Bus resources - we don't need them for
1101
1102
** Legacy boxes but it's nice to see in /proc/iomem.
···
1495
1494
1496
1495
pci_add_resource_offset(&resources, &lba_dev->hba.io_space,
1497
1496
HBA_PORT_BASE(lba_dev->hba.hba_num));
1498
-
if (lba_dev->hba.elmmio_space.start)
1497
+
if (lba_dev->hba.elmmio_space.flags)
1499
1498
pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space,
1500
1499
lba_dev->hba.lmmio_space_offset);
1501
1500
if (lba_dev->hba.lmmio_space.flags)
+1
-1
drivers/parport/Kconfig
+1
-1
drivers/parport/Kconfig
···
71
71
72
72
config PARPORT_PC_SUPERIO
73
73
bool "SuperIO chipset support"
74
-
depends on PARPORT_PC
74
+
depends on PARPORT_PC && !PARISC
75
75
help
76
76
Saying Y here enables some probes for Super-IO chipsets in order to
77
77
find out things like base addresses, IRQ lines and DMA channels. It
+3
-3
drivers/parport/parport_gsc.c
+3
-3
drivers/parport/parport_gsc.c
···
234
234
235
235
struct parport *parport_gsc_probe_port(unsigned long base,
236
236
unsigned long base_hi, int irq,
237
-
int dma, struct pci_dev *dev)
237
+
int dma, struct parisc_device *padev)
238
238
{
239
239
struct parport_gsc_private *priv;
240
240
struct parport_operations *ops;
···
258
258
priv->ctr_writable = 0xff;
259
259
priv->dma_buf = 0;
260
260
priv->dma_handle = 0;
261
-
priv->dev = dev;
262
261
p->base = base;
263
262
p->base_hi = base_hi;
264
263
p->irq = irq;
···
281
282
return NULL;
282
283
}
283
284
285
+
p->dev = &padev->dev;
284
286
p->base_hi = base_hi;
285
287
p->modes = tmp.modes;
286
288
p->size = (p->modes & PARPORT_MODE_EPP)?8:3;
···
373
373
}
374
374
375
375
p = parport_gsc_probe_port(port, 0, dev->irq,
376
-
/* PARPORT_IRQ_NONE */ PARPORT_DMA_NONE, NULL);
376
+
/* PARPORT_IRQ_NONE */ PARPORT_DMA_NONE, dev);
377
377
if (p)
378
378
parport_count++;
379
379
dev_set_drvdata(&dev->dev, p);