Merge 'android-3.18.107' (bb08153d) into 'msm-3.18'

VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 106

SUBLEVEL = 107

EXTRAVERSION =

NAME = Diseased Newt

CONFIG_POSIX_MQUEUE=y

# CONFIG_USELIB is not set

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_PCSPKR_PLATFORM is not set

CONFIG_BPF_SYSCALL=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_SMP=y

CONFIG_HYPERVISOR_GUEST=y

CONFIG_PARAVIRT=y

CONFIG_PARAVIRT_SPINLOCKS=y

CONFIG_MCORE2=y

CONFIG_PROCESSOR_SELECT=y

# CONFIG_CPU_SUP_CENTAUR is not set

CONFIG_PREEMPT=y

CONFIG_X86_MSR=y

CONFIG_X86_CPUID=y

CONFIG_KSM=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

CONFIG_TRANSPARENT_HUGEPAGE=y

# CONFIG_MTRR is not set

CONFIG_HZ_100=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_PHYSICAL_ALIGN=0x1000000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0 reboot=p"

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM_RUNTIME=y

CONFIG_PM_DEBUG=y

CONFIG_SUSPEND_TIME=y

CONFIG_ACPI_PROCFS_POWER=y

# CONFIG_ACPI_FAN is not set

# CONFIG_ACPI_THERMAL is not set

# CONFIG_X86_PM_TIMER is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_X86_ACPI_CPUFREQ=y

# CONFIG_X86_ACPI_CPUFREQ_CPB is not set

CONFIG_PCI_MMCONFIG=y

CONFIG_PCI_MSI=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_IA32_EMULATION=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG_DESTROY=y

CONFIG_TCP_CONG_ADVANCED=y

# CONFIG_TCP_CONG_BIC is not set

# CONFIG_TCP_CONG_WESTWOOD is not set

# CONFIG_TCP_CONG_HTCP is not set

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_INET6_AH=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y

CONFIG_NF_CONNTRACK_H323=y

CONFIG_NF_CONNTRACK_IRC=y

CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=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_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y

CONFIG_NETFILTER_XT_MATCH_HELPER=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

CONFIG_NETFILTER_XT_MATCH_LENGTH=y

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MAC=y

CONFIG_NETFILTER_XT_MATCH_MARK=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y

CONFIG_IP_NF_ARPTABLES=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MATCH_IPV6HEADER=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y

CONFIG_NET_CLS_ACT=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_RFKILL=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEBUG_DEVRES=y

CONFIG_OF=y

CONFIG_OF_SELFTEST=y

# CONFIG_PNP_DEBUG_MESSAGES is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y

CONFIG_UID_STAT=y

CONFIG_UID_SYS_STATS=y

CONFIG_MEMORY_STATE_TIME=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_SCSI_VIRTIO=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_MIRROR=y

CONFIG_DM_ZERO=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=y

CONFIG_VIRTIO_NET=y

# CONFIG_ETHERNET is not set

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_USB_USBNET=y

# CONFIG_USB_NET_AX8817X is not set

# CONFIG_USB_NET_AX88179_178A is not set

# CONFIG_USB_NET_CDCETHER is not set

# CONFIG_USB_NET_CDC_NCM is not set

# CONFIG_USB_NET_NET1080 is not set

# CONFIG_USB_NET_CDC_SUBSET is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_MAC80211_HWSIM=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_KEYRESET=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD_FF=y

CONFIG_JOYSTICK_XPAD_LEDS=y

CONFIG_INPUT_TABLET=y

CONFIG_TABLET_USB_ACECAD=y

CONFIG_TABLET_USB_AIPTEK=y

CONFIG_TABLET_USB_GTCO=y

CONFIG_TABLET_USB_HANWANG=y

CONFIG_TABLET_USB_KBTAB=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=y

# CONFIG_SERIO_I8042 is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=48

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM_INTEL is not set

# CONFIG_HW_RANDOM_AMD is not set

# CONFIG_HW_RANDOM_VIA is not set

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_HPET=y

# CONFIG_HPET_MMAP_DEFAULT is not set

# CONFIG_DEVPORT is not set

# CONFIG_ACPI_I2C_OPREGION is not set

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_PTP_1588_CLOCK=y

CONFIG_GPIOLIB=y

# CONFIG_HWMON is not set

# CONFIG_X86_PKG_TEMP_THERMAL is not set

CONFIG_WATCHDOG=y

CONFIG_SOFT_WATCHDOG=y

CONFIG_MEDIA_SUPPORT=y

# CONFIG_DVB_TUNER_DIB0070 is not set

# CONFIG_DVB_TUNER_DIB0090 is not set

# CONFIG_VGA_ARB is not set

CONFIG_DRM=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_HIDRAW=y

CONFIG_UHID=y

# CONFIG_HID_GENERIC is not set

CONFIG_HID_A4TECH=y

CONFIG_HID_ACRUX=y

CONFIG_HID_ACRUX_FF=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_PRODIKEYS=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_DRAGONRISE=y

CONFIG_DRAGONRISE_FF=y

CONFIG_HID_EMS_FF=y

CONFIG_HID_ELECOM=y

CONFIG_HID_EZKEY=y

CONFIG_HID_HOLTEK=y

CONFIG_HID_KEYTOUCH=y

CONFIG_HID_KYE=y

CONFIG_HID_UCLOGIC=y

CONFIG_HID_WALTOP=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_KENSINGTON=y

CONFIG_HID_LCPOWER=y

CONFIG_HID_LOGITECH=y

CONFIG_HID_LOGITECH_DJ=y

CONFIG_LOGITECH_FF=y

CONFIG_LOGIRUMBLEPAD2_FF=y

CONFIG_LOGIG940_FF=y

CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NTRIG=y

CONFIG_HID_ORTEK=y

CONFIG_HID_PANTHERLORD=y

CONFIG_PANTHERLORD_FF=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_PICOLCD=y

CONFIG_HID_PRIMAX=y

CONFIG_HID_ROCCAT=y

CONFIG_HID_SAITEK=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SPEEDLINK=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_GREENASIA_FF=y

CONFIG_HID_SMARTJOYPLUS=y

CONFIG_SMARTJOYPLUS_FF=y

CONFIG_HID_TIVO=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

CONFIG_HID_WACOM=y

CONFIG_HID_WIIMOTE=y

CONFIG_HID_ZEROPLUS=y

CONFIG_HID_ZYDACRON=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_GADGET=y

CONFIG_USB_DUMMY_HCD=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_SWITCH=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_MMIO=y

CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ANDROID_VSOC=y

CONFIG_ION=y

# CONFIG_X86_PLATFORM_DEVICES is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_FIRMWARE_MEMMAP is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_QFMT_V2=y

CONFIG_AUTOFS4_FS=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_FRAME_WARN=1024

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_PANIC_TIMEOUT=5

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_IO_DELAY_NONE=y

CONFIG_DEBUG_BOOT_PARAMS=y

CONFIG_OPTIMIZE_INLINING=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_PATH=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

CONFIG_X509_CERTIFICATE_PARSER=y

CONFIG_PKCS7_MESSAGE_PARSER=y

CONFIG_PKCS7_TEST_KEY=y

extern void setup_boot_APIC_clock(void);

extern void setup_secondary_APIC_clock(void);

extern int APIC_init_uniprocessor(void);

#ifdef CONFIG_X86_64

static inline int apic_force_enable(unsigned long addr)

{

	return -1;

}

#else

extern int apic_force_enable(unsigned long addr);

#endif

/*

 * On 32bit this is mach-xxx local

	return 0;

}

const struct irq_domain_ops ioapic_irq_domain_ops = {

static const struct irq_domain_ops ioapic_irq_domain_ops = {

	.map = mp_irqdomain_map,

	.unmap = mp_irqdomain_unmap,

	.xlate = ioapic_xlate,

	hpet2 -= hpet1;

	tmp = ((u64)hpet2 * hpet_readl(HPET_PERIOD));

	do_div(tmp, 1000000);

	do_div(deltatsc, tmp);

	deltatsc = div64_u64(deltatsc, tmp);

	return (unsigned long) deltatsc;

}