Commit 4629292a authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] misc updates

- CREDITS & MAINTAINERS updates
- changes for the new kstat/dkstat struct
- Kconfig updates
- L_TARGET isn't obsolete yet
- fix the sys_truncate/truncate64 issue properly this time
- add MAP_POPULATE & MAP_NONBLOCK definitions
parent 2c461854
...@@ -562,7 +562,7 @@ S: USA ...@@ -562,7 +562,7 @@ S: USA
N: Randolph Chung N: Randolph Chung
E: tausq@debian.org E: tausq@debian.org
D: Linux/PA-RISC hacker D: Linux/PA-RISC hacker
S: Fremont, CA 94538 S: Los Altos, CA 94022
S: USA S: USA
N: Juan Jose Ciarlante N: Juan Jose Ciarlante
...@@ -1141,11 +1141,11 @@ S: Stellenbosch, Western Cape ...@@ -1141,11 +1141,11 @@ S: Stellenbosch, Western Cape
S: South Africa S: South Africa
N: Grant Grundler N: Grant Grundler
E: grundler@puffin.external.hp.com E: grundler@parisc-linux.org
W: http://www.grundler.net/
W: http://obmouse.sourceforge.net/ W: http://obmouse.sourceforge.net/
W: http://www.parisc-linux.org/
D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
D: PA-RISC - IO Interrupt/PCI HBA/IO MMU author and architect D: PA-RISC - Interrupt/PCI HBA/IOMMU author and architect
S: Mountain View, California S: Mountain View, California
S: USA S: USA
......
...@@ -1283,6 +1283,15 @@ L: linux-parport@torque.net ...@@ -1283,6 +1283,15 @@ L: linux-parport@torque.net
W: http://www.torque.net/linux-pp.html W: http://www.torque.net/linux-pp.html
S: Maintained S: Maintained
PARISC ARCHITECTURE
P: Matthew Wilcox
M: matthew@wil.cx
P: Grant Grundler
M: grundler@parisc-linux.org
L: parisc-linux@parisc-linux.org
W: http://www.parisc-linux.org/
S: Maintained
PERSONALITY HANDLING PERSONALITY HANDLING
P: Christoph Hellwig P: Christoph Hellwig
M: hch@infradead.org M: hch@infradead.org
......
...@@ -93,10 +93,27 @@ config PA11 ...@@ -93,10 +93,27 @@ config PA11
config PARISC64 config PARISC64
bool "64-bit kernel" bool "64-bit kernel"
depends on PA8X00 depends on PA8X00
help
Enable this if you want to support 64bit kernel on PA-RISC platform.
At the moment, only people willing to use more than 2GB of RAM,
or having a 64bit-only capable PA-RISC machine should say Y here.
Since there is no 64bit userland on PA-RISC, there is no point to
enable this option otherwise. The 64bit kernel is significantly bigger
and slower than the 32bit one.
config PDC_NARROW config PDC_NARROW
bool "32-bit firmware" bool "32-bit firmware"
depends on PARISC64 depends on PARISC64
help
This option will enable owners of C160, C180, C200, C240, C360, J280,
J282, J2240 and some D/K/R class to run a 64bit kernel with their
32bit PDC firmware.
Nobody should try this option unless they know what they are doing.
If unsure, say N.
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
...@@ -211,14 +228,11 @@ source "drivers/parport/Kconfig" ...@@ -211,14 +228,11 @@ source "drivers/parport/Kconfig"
source "drivers/block/Kconfig" source "drivers/block/Kconfig"
menu "ATA/IDE/MFM/RLL support"
depends on SUPERIO
menu "ATA/IDE/MFM/RLL support"
config IDE config IDE
tristate "ATA/IDE/MFM/RLL support" tristate "ATA/IDE/MFM/RLL support"
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
endmenu endmenu
menu "SCSI support" menu "SCSI support"
...@@ -245,6 +259,7 @@ config SCSI ...@@ -245,6 +259,7 @@ config SCSI
source drivers/scsi/Kconfig source drivers/scsi/Kconfig
endmenu endmenu
source "drivers/md/Kconfig" source "drivers/md/Kconfig"
...@@ -323,10 +338,22 @@ menu "Console drivers" ...@@ -323,10 +338,22 @@ menu "Console drivers"
config STI_CONSOLE config STI_CONSOLE
bool "STI console" bool "STI console"
help help
The STI console is the builtin display/keyboard on HP-PARISC STI refers to the HP "Standard Text Interface" which is a set of
machines. Say Y here to build support for it into your kernel. BIOS routines contained in a ROM chip in HP PA-RISC based machines.
Enabling this option will give you an 8 color text console on
most of the PA-RISC systems.
Really old HP boxes may not have STI, in which case you must use the
PDC console or your primary serial port as a console.
The text console uses a strange memory layout, and changing the
plane mask to create colored characters requires calls to the STI
routines. Because of that do not expect it to be actually very fast,
but it is sufficient for basic text console functions, including fonts.
The alternative is to use your primary serial port as a console. The alternative is to use your primary serial port as a console.
It is safe to enable this option, so you should probably say "Y".
config DUMMY_CONSOLE config DUMMY_CONSOLE
bool bool
depends on STI_CONSOLE || SERIAL_8250_CONSOLE depends on STI_CONSOLE || SERIAL_8250_CONSOLE
......
...@@ -235,7 +235,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -235,7 +235,7 @@ int show_interrupts(struct seq_file *p, void *v)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
for (; j < NR_CPUS; j++) for (; j < NR_CPUS; j++)
#endif #endif
seq_printf(p, "%10u ", kstat.irqs[j][regnr][irq_no]); seq_printf(p, "%10u ", kstat_cpu(j).irqs[regnr][irq_no]);
seq_printf(p, " %14s", seq_printf(p, " %14s",
region->data.name ? region->data.name : "N/A"); region->data.name ? region->data.name : "N/A");
...@@ -372,7 +372,7 @@ void do_irq(struct irqaction *action, int irq, struct pt_regs * regs) ...@@ -372,7 +372,7 @@ void do_irq(struct irqaction *action, int irq, struct pt_regs * regs)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
irq_enter(); irq_enter();
++kstat.irqs[cpu][IRQ_REGION(irq)][IRQ_OFFSET(irq)]; ++kstat_cpu(cpu).irqs[IRQ_REGION(irq)][IRQ_OFFSET(irq)];
DBG_IRQ(irq, ("do_irq(%d) %d+%d\n", irq, IRQ_REGION(irq), IRQ_OFFSET(irq))); DBG_IRQ(irq, ("do_irq(%d) %d+%d\n", irq, IRQ_REGION(irq), IRQ_OFFSET(irq)));
......
...@@ -149,24 +149,42 @@ long sys_shmat_wrapper(int shmid, char *shmaddr, int shmflag) ...@@ -149,24 +149,42 @@ long sys_shmat_wrapper(int shmid, char *shmaddr, int shmflag)
/* Fucking broken ABI */ /* Fucking broken ABI */
#ifdef CONFIG_PARISC64
extern asmlinkage long sys_truncate(const char *, unsigned long);
extern asmlinkage long sys_ftruncate(unsigned int, unsigned long);
asmlinkage long parisc_truncate64(const char * path,
unsigned int high, unsigned int low)
{
return sys_truncate(path, (long)high << 32 | low);
}
asmlinkage long parisc_ftruncate64(unsigned int fd,
unsigned int high, unsigned int low)
{
return sys_ftruncate(fd, (long)high << 32 | low);
}
#else
extern asmlinkage long sys_truncate64(const char *, loff_t); extern asmlinkage long sys_truncate64(const char *, loff_t);
extern asmlinkage long sys_ftruncate64(unsigned int, loff_t); extern asmlinkage long sys_ftruncate64(unsigned int, loff_t);
extern asmlinkage ssize_t sys_pread64(unsigned int fd, char *buf,
size_t count, loff_t pos);
extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char *buf,
size_t count, loff_t pos);
asmlinkage long parisc_truncate64(const char * path, asmlinkage long parisc_truncate64(const char * path,
unsigned int high, unsigned int low) unsigned int high, unsigned int low)
{ {
return sys_truncate(path, (loff_t)high << 32 | low); return sys_truncate64(path, (loff_t)high << 32 | low);
} }
asmlinkage long parisc_ftruncate64(unsigned int fd, asmlinkage long parisc_ftruncate64(unsigned int fd,
unsigned int high, unsigned int low) unsigned int high, unsigned int low)
{ {
return sys_ftruncate(fd, (loff_t)high << 32 | low); return sys_ftruncate64(fd, (loff_t)high << 32 | low);
} }
#endif
extern asmlinkage ssize_t sys_pread64(unsigned int fd, char *buf,
size_t count, loff_t pos);
extern asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char *buf,
size_t count, loff_t pos);
asmlinkage ssize_t parisc_pread64(unsigned int fd, char *buf, size_t count, asmlinkage ssize_t parisc_pread64(unsigned int fd, char *buf, size_t count,
unsigned int high, unsigned int low) unsigned int high, unsigned int low)
......
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
# Makefile for parisc-specific library files # Makefile for parisc-specific library files
# #
L_TARGET := lib.a
obj-y := lusercopy.o bitops.o checksum.o io.o memset.o obj-y := lusercopy.o bitops.o checksum.o io.o memset.o
...@@ -22,18 +22,22 @@ config GSC_LASI ...@@ -22,18 +22,22 @@ config GSC_LASI
bool "Lasi I/O support" bool "Lasi I/O support"
depends on GSC depends on GSC
help help
Say Y here to directly support the Lasi controller chip found on Say Y here to support the Lasi multifunction chip found in
PA-RISC workstations. Linux-oriented documentation for this chip many PA-RISC workstations & servers. It includes interfaces
can be found at <http://www.parisc-linux.org/documentation/>. for a parallel port, serial port, NCR 53c710 SCSI, Apricot
Ethernet, Harmony audio, PS/2 keyboard & mouse, ISDN, telephony
and floppy. Note that you must still enable all the individual
drivers for these chips.
config GSC_WAX config GSC_WAX
bool "Wax I/O support" bool "Wax I/O support"
depends on GSC depends on GSC
help help
Say Y here to support the Wax GSC to EISA Bridge found in some older Say Y here to support the Wax multifunction chip found in some
systems, including B/C/D/R class. Some machines use Wax for other older systems, including B/C/D/R class and 715/64, 715/80 and
purposes, such as providing one of the serial ports or being an 715/100. Wax includes an EISA adapter, a serial port (not always
interface chip for an X.25 GSC card. used), a HIL interface chip and is also known to be used as the
GSC bridge for an X.25 GSC card.
config EISA config EISA
bool "EISA support" bool "EISA support"
...@@ -64,7 +68,8 @@ config GSC_DINO ...@@ -64,7 +68,8 @@ config GSC_DINO
machines from the B132 to the C360, the J2240 and the A180. Some machines from the B132 to the C360, the J2240 and the A180. Some
GSC/HSC cards (eg gigabit & dual 100 Mbit Ethernet) have a Dino on GSC/HSC cards (eg gigabit & dual 100 Mbit Ethernet) have a Dino on
the card, and you also need to say Y here if you have such a card. the card, and you also need to say Y here if you have such a card.
If in doubt, say Y. Note that Dino also supplies one of the serial ports on certain
machines. If in doubt, say Y.
config PCI_LBA config PCI_LBA
bool "LBA/Elroy PCI support" bool "LBA/Elroy PCI support"
...@@ -84,6 +89,8 @@ config IOMMU_SBA ...@@ -84,6 +89,8 @@ config IOMMU_SBA
depends on PCI_LBA depends on PCI_LBA
default y default y
source "drivers/pci/Kconfig"
#config PCI_EPIC #config PCI_EPIC
# bool "EPIC/SAGA PCI support" # bool "EPIC/SAGA PCI support"
# depends on PCI # depends on PCI
...@@ -93,11 +100,18 @@ config SUPERIO ...@@ -93,11 +100,18 @@ config SUPERIO
depends on PCI depends on PCI
help help
Say Y here to support the SuperIO chip found in Bxxxx, C3xxx and Say Y here to support the SuperIO chip found in Bxxxx, C3xxx and
J5xxx+ machines. J5xxx+ machines. This enables IDE, Floppy, Parallel Port, and
Serial port on those machines.
source "drivers/pci/Kconfig"
config CHASSIS_LCD_LED config CHASSIS_LCD_LED
bool "Chassis LCD and LED support" bool "Chassis LCD and LED support"
help
Say Y here if you want to enable support for the Heartbeat,
Disk/Network activities LEDs on some PA-RISC machines,
or support for the LCD that can be found on recent material.
This has nothing to do with LED State support for A, J and E class.
If unsure, say Y.
endmenu endmenu
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/blkdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/hardware.h> #include <asm/hardware.h>
...@@ -405,7 +406,7 @@ static void led_get_diskio_stats(int addvalue) ...@@ -405,7 +406,7 @@ static void led_get_diskio_stats(int addvalue)
total = 0; total = 0;
for (major = 0; major < DK_MAX_MAJOR; major++) { for (major = 0; major < DK_MAX_MAJOR; major++) {
for (disk = 0; disk < DK_MAX_DISK; disk++) for (disk = 0; disk < DK_MAX_DISK; disk++)
total += kstat.dk_drive[major][disk]; total += dkstat.drive[major][disk];
} }
total -= diskio_total_last; total -= diskio_total_last;
......
...@@ -38,9 +38,10 @@ config PARPORT_PC ...@@ -38,9 +38,10 @@ config PARPORT_PC
tristate "PC-style hardware" tristate "PC-style hardware"
depends on PARPORT depends on PARPORT
---help--- ---help---
You should say Y here if you have a PC-style parallel port. All IBM You should say Y here if you have a PC-style parallel port. All
PC compatible computers and some Alphas have PC-style parallel IBM PC compatible computers and some Alphas have PC-style
ports. parallel ports. PA-RISC owners should only say Y here if they
have a SuperIO parallel port.
This code is also available as a module. If you want to compile it This code is also available as a module. If you want to compile it
as a module ( = code which can be inserted in and removed from the as a module ( = code which can be inserted in and removed from the
...@@ -121,12 +122,9 @@ config PARPORT_ATARI ...@@ -121,12 +122,9 @@ config PARPORT_ATARI
called parport_atari.o. If in doubt, saying N is the safe plan. called parport_atari.o. If in doubt, saying N is the safe plan.
config PARPORT_GSC config PARPORT_GSC
tristate "LASI/ASP builtin parallel-port" tristate
depends on GSC_LASI && PARPORT depends on GSC
help default PARPORT
Say Y here to build in low-level parallel-support for PC-style
hardware integrated in the LASI-Controller (on the GSC Bus) for
HP-PARISC workstations.
config PARPORT_SUNBPP config PARPORT_SUNBPP
tristate "Sparc hardware (EXPERIMENTAL)" tristate "Sparc hardware (EXPERIMENTAL)"
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#define MAP_LOCKED 0x2000 /* pages are locked */ #define MAP_LOCKED 0x2000 /* pages are locked */
#define MAP_NORESERVE 0x4000 /* don't check for reservations */ #define MAP_NORESERVE 0x4000 /* don't check for reservations */
#define MAP_GROWSDOWN 0x8000 /* stack-like segment */ #define MAP_GROWSDOWN 0x8000 /* stack-like segment */
#define MAP_POPULATE 0x10000 /* populate (prefault) pagetables */
#define MAP_NONBLOCK 0x20000 /* do not block on IO */
#define MS_SYNC 1 /* synchronous memory sync */ #define MS_SYNC 1 /* synchronous memory sync */
#define MS_ASYNC 2 /* sync memory asynchronously */ #define MS_ASYNC 2 /* sync memory asynchronously */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment