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

Commit b6d98422 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/cleanups'; commit 'v2.6.29' into sched/core

parents 67aa0f76 8e0ee43b

Documentation/filesystems/ext2.txt

+3 −2
Original line number Diff line number Diff line
@@ -376,7 +376,8 @@ Implementations for: 
Windows 95/98/NT/2000	http://www.chrysocome.net/explore2fs

Windows 95 (*)		http://www.yipton.net/content.html#FSDEXT2

DOS client (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

OS/2 (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

OS/2 (+)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

RISC OS client		http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/IscaFS/



(*) no longer actively developed/supported (as of Mar 2009)
 
(*) no longer actively developed/supported (as of Apr 2001)

(+) no longer actively developed/supported (as of Mar 2009)

Documentation/filesystems/proc.txt

+7 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,13 @@ of problems on the network like duplicate address or bad checksums. Normally, 
this should be enabled, but if the problem persists the messages can be

disabled.



netdev_budget

-------------



Maximum number of packets taken from all interfaces in one polling cycle (NAPI

poll). In one polling cycle interfaces which are registered to polling are

probed in a round-robin manner. The limit of packets in one such probe can be

set per-device via sysfs class/net/<device>/weight .



netdev_max_backlog

------------------

Makefile

+5 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc8

NAME = Erotic Pickled Herring

EXTRAVERSION =

NAME = Temporary Tasmanian Devil



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"
@@ -569,6 +569,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) 
# disable invalid "can't wrap" optimzations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)



# revert to pre-gcc-4.4 behaviour of .eh_frame

KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

warn-assign = \

arch/powerpc/kernel/head_32.S

+9 −0
Original line number Diff line number Diff line
@@ -513,6 +513,9 @@ InstructionTLBMiss: 
	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

BEGIN_FTR_SECTION

	rlwinm	r1,r1,0,~_PAGE_COHERENT	/* clear M (coherence not required) */

END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT)

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_IMISS

	tlbli	r3
@@ -587,6 +590,9 @@ DataLoadTLBMiss: 
	rlwimi	r3,r3,32-1,31,31	/* _PAGE_USER -> PP lsb */

	ori	r1,r1,0xe04		/* clear out reserved bits */

	andc	r1,r3,r1		/* PP = user? (rw&dirty? 2: 3): 0 */

BEGIN_FTR_SECTION

	rlwinm	r1,r1,0,~_PAGE_COHERENT	/* clear M (coherence not required) */

END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT)

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS

	tlbld	r3
@@ -655,6 +661,9 @@ DataStoreTLBMiss: 
	rlwimi	r3,r3,32-1,30,30	/* _PAGE_USER -> PP msb */

	li	r1,0xe05		/* clear out reserved bits & PP lsb */

	andc	r1,r3,r1		/* PP = user? 2: 0 */

BEGIN_FTR_SECTION

	rlwinm	r1,r1,0,~_PAGE_COHERENT	/* clear M (coherence not required) */

END_FTR_SECTION_IFCLR(CPU_FTR_NEED_COHERENT)

	mtspr	SPRN_RPA,r1

	mfspr	r3,SPRN_DMISS

	tlbld	r3

arch/sparc/include/asm/pil.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define PIL_DEVICE_IRQ		5

#define PIL_SMP_CALL_FUNC_SNGL	6

#define PIL_DEFERRED_PCR_WORK	7

#define PIL_KGDB_CAPTURE	8

#define PIL_NORMAL_MAX		14

#define PIL_NMI			15