Merge branch 'from-linus' into upstream (69758820) · Commits · e / devices / android_kernel_teracube_2e

Documentation/fb/imacfb.txt

0 → 100644

+31 −0

Original line number	Diff line number	Diff line

		What is imacfb?
		===============

		This is a generic EFI platform driver for Intel based Apple computers.
		Imacfb is only for EFI booted Intel Macs.

		Supported Hardware
		==================

		iMac 17"/20"
		Macbook
		Macbook Pro 15"/17"
		MacMini

		How to use it?
		==============

		Imacfb does not have any kind of autodetection of your machine.
		You have to add the fillowing kernel parameters in your elilo.conf:
		Macbook :
		video=imacfb:macbook
		MacMini :
		video=imacfb:mini
		Macbook Pro 15", iMac 17" :
		video=imacfb:i17
		Macbook Pro 17", iMac 20" :
		video=imacfb:i20

		--
		Edgar Hucek <gimli@dark-green.com>

Documentation/networking/ip-sysctl.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -294,15 +294,15 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
		Default: 87380*2 bytes.

		tcp_mem - vector of 3 INTEGERs: min, pressure, max
		low: below this number of pages TCP is not bothered about its
		min: below this number of pages TCP is not bothered about its
		memory appetite.

		pressure: when amount of memory allocated by TCP exceeds this number
		of pages, TCP moderates its memory consumption and enters memory
		pressure mode, which is exited when memory consumption falls
		under "low".
		under "min".

		high: number of pages allowed for queueing by all TCP sockets.
		max: number of pages allowed for queueing by all TCP sockets.

		Defaults are calculated at boot time from amount of available
		memory.

Documentation/powerpc/booting-without-of.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -1196,7 +1196,7 @@ platforms are moved over to use the flattened-device-tree model.
		- model : Model of the device. Can be "TSEC", "eTSEC", or "FEC"
		- compatible : Should be "gianfar"
		- reg : Offset and length of the register set for the device
		- address : List of bytes representing the ethernet address of
		- mac-address : List of bytes representing the ethernet address of
		this controller
		- interrupts : <a b> where a is the interrupt number and b is a
		field that represents an encoding of the sense and level
		@@ -1216,7 +1216,7 @@ platforms are moved over to use the flattened-device-tree model.
		model = "TSEC";
		compatible = "gianfar";
		reg = <24000 1000>;
		address = [ 00 E0 0C 00 73 00 ];
		mac-address = [ 00 E0 0C 00 73 00 ];
		interrupts = <d 3 e 3 12 3>;
		interrupt-parent = <40000>;
		phy-handle = <2452000>
		@@ -1498,7 +1498,7 @@ not necessary as they are usually the same as the root node.
		model = "TSEC";
		compatible = "gianfar";
		reg = <24000 1000>;
		address = [ 00 E0 0C 00 73 00 ];
		mac-address = [ 00 E0 0C 00 73 00 ];
		interrupts = <d 3 e 3 12 3>;
		interrupt-parent = <40000>;
		phy-handle = <2452000>;
		@@ -1511,7 +1511,7 @@ not necessary as they are usually the same as the root node.
		model = "TSEC";
		compatible = "gianfar";
		reg = <25000 1000>;
		address = [ 00 E0 0C 00 73 01 ];
		mac-address = [ 00 E0 0C 00 73 01 ];
		interrupts = <13 3 14 3 18 3>;
		interrupt-parent = <40000>;
		phy-handle = <2452001>;
		@@ -1524,7 +1524,7 @@ not necessary as they are usually the same as the root node.
		model = "FEC";
		compatible = "gianfar";
		reg = <26000 1000>;
		address = [ 00 E0 0C 00 73 02 ];
		mac-address = [ 00 E0 0C 00 73 02 ];
		interrupts = <19 3>;
		interrupt-parent = <40000>;
		phy-handle = <2452002>;

Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -309,9 +309,6 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)

		CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common
		# Force gcc to behave correct even for buggy distributions
		CFLAGS += $(call cc-option, -fno-stack-protector)

		AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)
		@@ -486,6 +483,8 @@ else
		CFLAGS += -O2
		endif

		include $(srctree)/arch/$(ARCH)/Makefile

		ifdef CONFIG_FRAME_POINTER
		CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
		else
		@@ -500,7 +499,8 @@ ifdef CONFIG_DEBUG_INFO
		CFLAGS += -g
		endif

		include $(srctree)/arch/$(ARCH)/Makefile
		# Force gcc to behave correct even for buggy distributions
		CFLAGS += $(call cc-option, -fno-stack-protector)

		# arch Makefile may override CC so keep this after arch Makefile is included
		NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)

arch/arm/kernel/traps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ NORET_TYPE void die(const char str, struct pt_regs regs, int err)
		spin_unlock_irq(&die_lock);

		if (panic_on_oops)
		panic("Fatal exception: panic_on_oops");
		panic("Fatal exception");

		do_exit(SIGSEGV);
		}