Commit 69d1d523 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] make ptr_to_pide() static
  [PARISC] head.S: section mismatch fixes
  [PARISC] add back Crestone Peak cpu
  [PARISC] futex: special case cmpxchg NULL in kernel space
  [PARISC] clean up show_stack
  [PARISC] add pa8900 CPUs to hardware inventory
  [PARISC] clean up include/asm-parisc/elf.h
  [PARISC] move defconfig to arch/parisc/configs/
  [PARISC] add back AD1889 MAINTAINERS entry
  [PARISC] pdc_console: fix bizarre panic on boot
  [PARISC] dump_stack in show_regs
  [PARISC] pdc_stable: fix compile errors
  [PARISC] remove unused pdc_iodc_printf function
  [PARISC] bump __NR_syscalls
  [PARISC] unbreak pgalloc.h
  [PARISC] move VMALLOC_* definitions to fixmap.h
  [PARISC] wire up timerfd syscalls
  [PARISC] remove old timerfd syscall
parents 9a9e0d68 56ee0cfd

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -266,6 +266,15 @@ L: linux-acpi@vger.kernel.org 
W:      http://www.lesswatts.org/projects/acpi/

S:      Maintained



AD1889 ALSA SOUND DRIVER

P:     Kyle McMartin

M:     kyle@parisc-linux.org

P:     Thibaut Varene

M:     T-Bone@parisc-linux.org

W:     http://wiki.parisc-linux.org/AD1889

L:     linux-parisc@vger.kernel.org

S:     Maintained



ADM1025 HARDWARE MONITOR DRIVER

P:	Jean Delvare

M:	khali@linux-fr.org

arch/parisc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
# Modified for PA-RISC Linux by Paul Lahaie, Alex deVries, 

# Mike Shaver, Helge Deller and Martin K. Petersen

#



KBUILD_DEFCONFIG := default_defconfig



NM		= sh $(srctree)/arch/parisc/nm

CHECKFLAGS	+= -D__hppa__=1

arch/parisc/kernel/firmware.c

+17 −10
Original line number Diff line number Diff line
@@ -1080,6 +1080,9 @@ void pdc_io_reset_devices(void) 
	spin_unlock_irqrestore(&pdc_lock, flags);

}



/* locked by pdc_console_lock */

static int __attribute__((aligned(8)))   iodc_retbuf[32];

static char __attribute__((aligned(64))) iodc_dbuf[4096];



/**

 * pdc_iodc_print - Console print using IODC.
@@ -1091,24 +1094,20 @@ void pdc_io_reset_devices(void) 
 * Since the HP console requires CR+LF to perform a 'newline', we translate

 * "\n" to "\r\n".

 */

int pdc_iodc_print(unsigned char *str, unsigned count)

int pdc_iodc_print(const unsigned char *str, unsigned count)

{

	/* XXX Should we spinlock posx usage */

	static int posx;        /* for simple TAB-Simulation... */

	int __attribute__((aligned(8)))   iodc_retbuf[32];

	char __attribute__((aligned(64))) iodc_dbuf[4096];

	unsigned int i;

	unsigned long flags;



	memset(iodc_dbuf, 0, 4096);

	for (i = 0; i < count && i < 2048;) {

	for (i = 0; i < count && i < 79;) {

		switch(str[i]) {

		case '\n':

			iodc_dbuf[i+0] = '\r';

			iodc_dbuf[i+1] = '\n';

			i += 2;

			posx = 0;

			break;

			goto print;

		case '\t':

			while (posx & 7) {

				iodc_dbuf[i] = ' ';
@@ -1124,6 +1123,16 @@ int pdc_iodc_print(unsigned char *str, unsigned count) 
		}

	}



	/* if we're at the end of line, and not already inserting a newline,

	 * insert one anyway. iodc console doesn't claim to support >79 char

	 * lines. don't account for this in the return value.

	 */

	if (i == 79 && iodc_dbuf[i-1] != '\n') {

		iodc_dbuf[i+0] = '\r';

		iodc_dbuf[i+1] = '\n';

	}



print:

        spin_lock_irqsave(&pdc_lock, flags);

        real32_call(PAGE0->mem_cons.iodc_io,

                    (unsigned long)PAGE0->mem_cons.hpa, ENTRY_IO_COUT,
@@ -1142,11 +1151,9 @@ int pdc_iodc_print(unsigned char *str, unsigned count) 
 */

int pdc_iodc_getc(void)

{

	unsigned long flags;

        static int __attribute__((aligned(8)))   iodc_retbuf[32];

        static char __attribute__((aligned(64))) iodc_dbuf[4096];

	int ch;

	int status;

	unsigned long flags;



	/* Bail if no console input device. */

	if (!PAGE0->mem_kbd.iodc_io)

arch/parisc/kernel/hardware.c

+12 −1
Original line number Diff line number Diff line
@@ -274,7 +274,18 @@ static struct hp_hardware hp_hardware_list[] __devinitdata = { 
	{HPHW_NPROC,0x887,0x4,0x91,"Storm Peak Slow"},

	{HPHW_NPROC,0x888,0x4,0x91,"Storm Peak Fast DC-"},

	{HPHW_NPROC,0x889,0x4,0x91,"Storm Peak Fast"},

	{HPHW_NPROC,0x88A,0x4,0x91,"Crestone Peak"},

	{HPHW_NPROC,0x88A,0x4,0x91,"Crestone Peak Slow"},

	{HPHW_NPROC,0x88C,0x4,0x91,"Orca Mako+"},

	{HPHW_NPROC,0x88D,0x4,0x91,"Rainier/Medel Mako+ Slow"},

	{HPHW_NPROC,0x88E,0x4,0x91,"Rainier/Medel Mako+ Fast"},

	{HPHW_NPROC,0x894,0x4,0x91,"Mt. Hamilton Fast Mako+"},

	{HPHW_NPROC,0x895,0x4,0x91,"Storm Peak Slow Mako+"},

	{HPHW_NPROC,0x896,0x4,0x91,"Storm Peak Fast Mako+"},

	{HPHW_NPROC,0x897,0x4,0x91,"Storm Peak DC- Slow Mako+"},

	{HPHW_NPROC,0x898,0x4,0x91,"Storm Peak DC- Fast Mako+"},

	{HPHW_NPROC,0x899,0x4,0x91,"Mt. Hamilton Slow Mako+"},

	{HPHW_NPROC,0x89B,0x4,0x91,"Crestone Peak Mako+ Slow"},

	{HPHW_NPROC,0x89C,0x4,0x91,"Crestone Peak Mako+ Fast"},

	{HPHW_A_DIRECT, 0x004, 0x0000D, 0x00, "Arrakis MUX"}, 

	{HPHW_A_DIRECT, 0x005, 0x0000D, 0x00, "Dyun Kiuh MUX"}, 

	{HPHW_A_DIRECT, 0x006, 0x0000D, 0x00, "Baat Kiuh AP/MUX (40299B)"},

CRA Git | Maintained and supported by SUSTech CRA and CCSE