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

Commit 36fc48bf authored by Ian Maund's avatar Ian Maund
Browse files

Merge google-common commits into msm-3.10 

* google-au444-jun13: (67 commits)
  ping: prevent NULL pointer dereference on write to msg_name
  drivers: staging: android: split uapi out of android_alarm.h
  fix false disconnect due to a signal sent to the reading process
  tcp: add a sysctl to config the tcp_default_init_rwnd
  netfilter: xt_IDLETIMER: Revert to retain the kernel API format.
  android: configs: update 3.10 options
  android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
  video: adf: define constants for device-custom ioctls
  arm64: documentation: tighten up tagged pointer documentation
  android: configs: add IPV6 ROUTE INFO
  android: configs: add TIMER_STATS back, helps with sysrq t.
  gpiolib: remove warnning of allocations with IRQs disabled
  android: configs: Add HIDRAW to recommended set
  gpiolib: safer implementation of desc_to_gpio()
  timerfd: support CLOCK_BOOTTIME clock
  android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS
  android: configs: Reorder config fragments, update README
  ARM: fiq_glue: Add custom fiq return handler api.
  netfilter: xt_qtaguid: fix memory leak in seq_file handlers
  video: adf: fix fbdev blank -> dpms state mapping
  ...

Git-Repo: https://android.googlesource.com/kernel/common.git


Change-Id: Icebc16721344dee19f573a26b00476e5770b8ec5
Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parents 61b52bcb 3c5b64e1

Documentation/arm64/tagged-pointers.txt

+7 −7
Original line number Diff line number Diff line
@@ -18,17 +18,17 @@ this byte for application use, with the following caveats: 
	    parameters containing user virtual addresses *must* have

	    their top byte cleared before trapping to the kernel.



	(2) Tags are not guaranteed to be preserved when delivering

	    signals. This means that signal handlers in applications

	    making use of tags cannot rely on the tag information for

	    user virtual addresses being maintained for fields inside

	    siginfo_t. One exception to this rule is for signals raised

	    in response to debug exceptions, where the tag information

	(2) Non-zero tags are not preserved when delivering signals.

	    This means that signal handlers in applications making use

	    of tags cannot rely on the tag information for user virtual

	    addresses being maintained for fields inside siginfo_t.

	    One exception to this rule is for signals raised in response

	    to watchpoint debug exceptions, where the tag information

	    will be preserved.



	(3) Special care should be taken when using tagged pointers,

	    since it is likely that C compilers will not hazard two

	    addresses differing only in the upper bits.

	    virtual addresses differing only in the upper byte.



The architecture prevents the use of a tagged PC, so the upper byte will

be set to a sign-extension of bit 55 on exception return.

Documentation/filesystems/proc.txt

+6 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ is not associated with a file: 
 [stack:1001]             = the stack of the thread with tid 1001

 [vdso]                   = the "virtual dynamic shared object",

                            the kernel system call handler

 [anon:<name>]            = an anonymous mapping that has been

                            named by userspace



 or if empty, the mapping is anonymous.
@@ -419,6 +421,7 @@ KernelPageSize: 4 kB 
MMUPageSize:           4 kB

Locked:              374 kB

VmFlags: rd ex mr mw me de

Name:           name from userspace



the first of these lines shows the same information as is displayed for the

mapping in /proc/PID/maps.  The remaining lines show the size of the mapping
@@ -469,6 +472,9 @@ Note that there is no guarantee that every flag and associated mnemonic will 
be present in all further kernel releases. Things get changed, the flags may

be vanished or the reverse -- new added.



The "Name" field will only be present on a mapping that has been named by

userspace, and will show the name passed in by userspace.



This file is only present if the CONFIG_MMU kernel configuration option is

enabled.

android/configs/README

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ way to enable these options would be: 
This will generate a .config that can then be used to save a new defconfig or

compile a new kernel with Android features enabled.



Because there is no tool to consistently generate these config fragments,

lets keep them alphabetically sorted instead of random.

android/configs/android-base.cfg

+4 −1
Original line number Diff line number Diff line 
#  KEEP ALPHABETICALLY SORTED

# CONFIG_INET_LRO is not set

# CONFIG_MODULES is not set

# CONFIG_OABI_COMPAT is not set
@@ -16,7 +17,6 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CGROUP_SCHED=y

CONFIG_DM_CRYPT=y

CONFIG_EMBEDDED=y

CONFIG_EXPERIMENTAL=y

CONFIG_FB=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_INET6_AH=y
@@ -34,6 +34,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y
@@ -81,9 +82,11 @@ CONFIG_NETFILTER_XT_MATCH_TIME=y 
CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NET_CLS_ACT=y

android/configs/android-recommended.cfg

+9 −7
Original line number Diff line number Diff line 
CONFIG_PANIC_TIMEOUT=5

CONFIG_KALLSYMS_ALL=y

CONFIG_PERF_EVENTS=y

CONFIG_COMPACTION=y

#  KEEP ALPHABETICALLY SORTED

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_NF_CONNTRACK_SIP is not set

# CONFIG_PM_WAKELOCKS_GC is not set

# CONFIG_VT is not set

CONFIG_ANDROID_RAM_CONSOLE=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BATTERY_ANDROID=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_COMPACTION=y

CONFIG_DM_UEVENT=y

CONFIG_DRAGONRISE_FF=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_GREENASIA_FF=y

CONFIG_HIDRAW=y

CONFIG_HID_A4TECH=y

CONFIG_HID_ACRUX=y

CONFIG_HID_ACRUX_FF=y
@@ -82,6 +79,7 @@ CONFIG_ION=y 
CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD_FF=y

CONFIG_JOYSTICK_XPAD_LEDS=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KSM=y

CONFIG_LOGIG940_FF=y

CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -89,13 +87,17 @@ CONFIG_LOGITECH_FF=y 
CONFIG_MD=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MSDOS_FS=y

CONFIG_PANIC_TIMEOUT=5

CONFIG_PANTHERLORD_FF=y

CONFIG_PERF_EVENTS=y

CONFIG_PM_DEBUG=y

CONFIG_PM_RUNTIME=y

CONFIG_PM_WAKELOCKS_LIMIT=0

CONFIG_POWER_SUPPLY=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_SCHEDSTATS=y

CONFIG_SCHED_TRACER=y

CONFIG_SMARTJOYPLUS_FF=y

CONFIG_SND=y

CONFIG_SOUND=y