Merge commit 'v3.3-rc4' into android-3.3
Colin Cross [Tue, 21 Feb 2012 20:45:05 +0000 (12:45 -0800)]
Conflicts:
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/staging/android/lowmemorykiller.c

Change-Id: I39ef9b27bb9febaee811b200ccac0ed5d51147f3

16 files changed:
1  2 
arch/arm/kernel/traps.c
arch/x86/kernel/process_64.c
drivers/misc/Kconfig
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/core/sdio.c
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/binder.c
drivers/usb/otg/Kconfig
fs/fs-writeback.c
include/linux/mmc/host.h
include/net/tcp.h
kernel/fork.c
net/ipv4/tcp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -714,35 -710,19 +715,35 @@@ static int mmc_sdio_init_card(struct mm
                goto finish;
        }
  
 -      /*
 -       * Read the common registers.
 -       */
 -      err = sdio_read_cccr(card, ocr);
 -      if (err)
 -              goto remove;
 +#ifdef CONFIG_MMC_EMBEDDED_SDIO
 +      if (host->embedded_sdio_data.cccr)
 +              memcpy(&card->cccr, host->embedded_sdio_data.cccr, sizeof(struct sdio_cccr));
 +      else {
 +#endif
 +              /*
 +               * Read the common registers.
 +               */
-               err = sdio_read_cccr(card);
++              err = sdio_read_cccr(card,  ocr);
 +              if (err)
 +                      goto remove;
 +#ifdef CONFIG_MMC_EMBEDDED_SDIO
 +      }
 +#endif
  
 -      /*
 -       * Read the common CIS tuples.
 -       */
 -      err = sdio_read_common_cis(card);
 -      if (err)
 -              goto remove;
 +#ifdef CONFIG_MMC_EMBEDDED_SDIO
 +      if (host->embedded_sdio_data.cis)
 +              memcpy(&card->cis, host->embedded_sdio_data.cis, sizeof(struct sdio_cis));
 +      else {
 +#endif
 +              /*
 +               * Read the common CIS tuples.
 +               */
 +              err = sdio_read_common_cis(card);
 +              if (err)
 +                      goto remove;
 +#ifdef CONFIG_MMC_EMBEDDED_SDIO
 +      }
 +#endif
  
        if (oldcard) {
                int same = (card->cis.vendor == oldcard->cis.vendor &&
@@@ -65,21 -100,8 +65,17 @@@ config ANDROID_LOW_MEMORY_KILLE
        ---help---
          Register processes to be killed when memory is low
  
- config ANDROID_PMEM
-       bool "Android pmem allocator"
-       depends on ARM
  source "drivers/staging/android/switch/Kconfig"
  
 +config ANDROID_INTF_ALARM_DEV
 +      bool "Android alarm driver"
 +      depends on RTC_CLASS
 +      default n
 +      help
 +        Provides non-wakeup and rtc backed wakeup alarms based on rtc or
 +        elapsed realtime, and a non-wakeup alarm on the monotonic clock.
 +        Also exports the alarm interface to user-space.
 +
  endif # if ANDROID
  
  endmenu
@@@ -6,9 -5,4 +6,8 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)        += ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)    += timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)      += timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
- obj-$(CONFIG_ANDROID_PMEM)            += pmem.o
  obj-$(CONFIG_ANDROID_SWITCH)          += switch/
 +obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)  += alarm-dev.o
 +obj-$(CONFIG_PERSISTENT_TRACER)               += trace_persistent.o
 +
 +CFLAGS_REMOVE_trace_persistent.o = -pg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge