Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b426e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] MAINTAINERS
  [PARISC] Make ioremap default to _nocache
  [PARISC] Add new entries to the syscall table
  [PARISC] Further work for multiple page sizes
  [PARISC] Fix up hil_kbd.c mismerge
  [PARISC] defconfig updates
  [PARISC] Document that we tolerate "Relaxed Ordering"
  [PARISC] Misc. janitorial work
  [PARISC] EISA regions must be mapped NO_CACHE
  [PARISC] OSS ad1889: Match register names with ALSA driver
parents cb6aef28 223232de

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -2065,8 +2065,12 @@ P: Matthew Wilcox 
M:	matthew@wil.cx

P:	Grant Grundler

M:	grundler@parisc-linux.org

P:	Kyle McMartin

M:	kyle@parisc-linux.org

L:	parisc-linux@parisc-linux.org

W:	http://www.parisc-linux.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

T:	cvs cvs.parisc-linux.org:/var/cvs/linux-2.6

S:	Maintained



PCI ERROR RECOVERY

arch/parisc/Kconfig

+31 −0
Original line number Diff line number Diff line
@@ -138,6 +138,37 @@ config 64BIT 
	  enable this option otherwise. The 64bit kernel is significantly bigger

	  and slower than the 32bit one.



choice

	prompt "Kernel page size"

	default PARISC_PAGE_SIZE_4KB  if !64BIT

	default PARISC_PAGE_SIZE_4KB  if 64BIT

#	default PARISC_PAGE_SIZE_16KB if 64BIT



config PARISC_PAGE_SIZE_4KB

	bool "4KB"

	help

	  This lets you select the page size of the kernel.  For best

	  performance, a page size of 16KB is recommended.  For best

	  compatibility with 32bit applications, a page size of 4KB should be

	  selected (the vast majority of 32bit binaries work perfectly fine

	  with a larger page size).



	  4KB                For best 32bit compatibility

	  16KB               For best performance

	  64KB               For best performance, might give more overhead.



	  If you don't know what to do, choose 4KB.



config PARISC_PAGE_SIZE_16KB

	bool "16KB (EXPERIMENTAL)"

	depends on PA8X00 && EXPERIMENTAL



config PARISC_PAGE_SIZE_64KB

	bool "64KB (EXPERIMENTAL)"

	depends on PA8X00 && EXPERIMENTAL



endchoice



config SMP

	bool "Symmetric multi-processing support"

	---help---

arch/parisc/defconfig

+315 −179

File changed.

Preview size limit exceeded, changes collapsed.

arch/parisc/kernel/asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -288,8 +288,11 @@ int main(void) 
	DEFINE(ASM_PGD_ENTRY_SIZE, PGD_ENTRY_SIZE);

	DEFINE(ASM_PMD_ENTRY_SIZE, PMD_ENTRY_SIZE);

	DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE);

	DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT);

	DEFINE(ASM_PT_INITIAL, PT_INITIAL);

	DEFINE(ASM_PAGE_SIZE, PAGE_SIZE);

	DEFINE(ASM_PAGE_SIZE_DIV64, PAGE_SIZE/64);

	DEFINE(ASM_PAGE_SIZE_DIV128, PAGE_SIZE/128);

	BLANK();

	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));

	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));

arch/parisc/kernel/cache.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1999 Helge Deller (07-13-1999)

 * Copyright (C) 1999-2006 Helge Deller <deller@gmx.de> (07-13-1999)

 * Copyright (C) 1999 SuSE GmbH Nuernberg

 * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org)

 *
@@ -358,5 +358,5 @@ void parisc_setup_cache_timing(void) 
	if (!parisc_cache_flush_threshold)

		parisc_cache_flush_threshold = FLUSH_THRESHOLD;



	printk("Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus());

	printk(KERN_INFO "Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus());

}