Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup'... (29219683) · Commits · e / devices / android_kernel_xiaomi_markw

CREDITS

+1 −1

+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)

+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
		------------------

+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"
		@@ -570,6 +570,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 = \

+23 −2

Original line number	Diff line number	Diff line
		#ifndef _M68K_PARAM_H
		#define _M68K_PARAM_H

		#ifdef __KERNEL__
		# define HZ CONFIG_HZ /* Internal kernel timer frequency */
		# define USER_HZ 100 /* .. some user interfaces are in "ticks" */
		# define CLOCKS_PER_SEC (USER_HZ) /* like times() */
		#endif

		#ifndef HZ
		#define HZ 100
		#endif

		#ifdef __uClinux__
		#include "param_no.h"
		#define EXEC_PAGESIZE 4096
		#else
		#include "param_mm.h"
		#define EXEC_PAGESIZE 8192
		#endif

		#ifndef NOGROUP
		#define NOGROUP (-1)
		#endif

		#define MAXHOSTNAMELEN 64 /* max length of hostname */

		#endif /* _M68K_PARAM_H */