Merge branch 'x86/core' into x86/mce2 (638bee71) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/cputopology.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of
		these macros in include/asm-XXX/topology.h:
		#define topology_physical_package_id(cpu)
		#define topology_core_id(cpu)
		#define topology_thread_siblings(cpu)
		#define topology_core_siblings(cpu)
		#define topology_thread_cpumask(cpu)
		#define topology_core_cpumask(cpu)

		The type of **_id is int.
		The type of siblings is cpumask_t.
		The type of siblings is (const) struct cpumask *.

		To be consistent on all architectures, include/linux/topology.h
		provides default definitions for any of the above macros that are

Documentation/kernel-parameters.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ In addition, the following text indicates that the option:
		Parameters denoted with BOOT are actually interpreted by the boot
		loader, and have no meaning to the kernel directly.
		Do not modify the syntax of boot loader parameters without extreme
		need or coordination with <Documentation/x86/i386/boot.txt>.
		need or coordination with <Documentation/x86/boot.txt>.

		There are also arch-specific kernel-parameters not documented here.
		See for example <Documentation/x86/x86_64/boot-options.txt>.
		@@ -2449,7 +2449,7 @@ and is between 256 and 4096 characters. It is defined in the file
		See Documentation/fb/modedb.txt.

		vga= [BOOT,X86-32] Select a particular video mode
		See Documentation/x86/i386/boot.txt and
		See Documentation/x86/boot.txt and
		Documentation/svga.txt.
		Use vga=ask for menu.
		This is actually a boot loader parameter; the value is

Documentation/x86/boot.txt

+7 −6

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ Offset Proto Name Meaning
		0202/4 2.00+ header Magic signature "HdrS"
		0206/2 2.00+ version Boot protocol version supported
		0208/4 2.00+ realmode_swtch Boot loader hook (see below)
		020C/2 2.00+ start_sys The load-low segment (0x1000) (obsolete)
		020C/2 2.00+ start_sys_seg The load-low segment (0x1000) (obsolete)
		020E/2 2.00+ kernel_version Pointer to kernel version string
		0210/1 2.00+ type_of_loader Boot loader identifier
		0211/1 2.00+ loadflags Boot protocol option flags
		@@ -170,10 +170,11 @@ Offset Proto Name Meaning
		0224/2 2.01+ heap_end_ptr Free memory after setup end
		0226/2 N/A pad1 Unused
		0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line
		022C/4 2.03+ initrd_addr_max Highest legal initrd address
		022C/4 2.03+ ramdisk_max Highest legal initrd address
		0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel
		0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not
		0235/3 N/A pad2 Unused
		0235/1 N/A pad2 Unused
		0236/2 N/A pad3 Unused
		0238/4 2.06+ cmdline_size Maximum size of the kernel command line
		023C/4 2.07+ hardware_subarch Hardware subarchitecture
		0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data
		@@ -299,14 +300,14 @@ Protocol: 2.00+
		e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version
		10.17.

		Field name: readmode_swtch
		Field name: realmode_swtch
		Type: modify (optional)
		Offset/size: 0x208/4
		Protocol: 2.00+

		Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)

		Field name: start_sys
		Field name: start_sys_seg
		Type: read
		Offset/size: 0x20c/2
		Protocol: 2.00+
		@@ -468,7 +469,7 @@ Protocol: 2.02+
		zero, the kernel will assume that your boot loader does not support
		the 2.02+ protocol.

		Field name: initrd_addr_max
		Field name: ramdisk_max
		Type: read
		Offset/size: 0x22c/4
		Protocol: 2.03+

Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
		endif

		# Force gcc to behave correct even for buggy distributions
		# Arch Makefiles may override this setting
		ifndef CONFIG_CC_STACKPROTECTOR
		KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
		endif

		ifdef CONFIG_FRAME_POINTER
		KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls

arch/alpha/include/asm/statfs.h

+2 −0

Original line number	Diff line number	Diff line
		#ifndef _ALPHA_STATFS_H
		#define _ALPHA_STATFS_H

		#include <linux/types.h>

		/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't
		even seem to implement statfs64 */
		#define __statfs_word __u32