From: Olof Johansson <olof@lixom.net>
Date: Fri, 19 Oct 2012 22:40:18 +0000 (-0700)
Subject: Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~13777^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=068a565afad3ae818cc0d5495479c4abccc7762c;p=mirror_ubuntu-artful-kernel.git

Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes

A collection of warning fixes on non-ARM code from Arnd Bergmann:

* 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: s3c: mark s3c2440_clk_add as __init_refok
  spi/s3c64xx: use correct dma_transfer_direction type
  pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
  USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
  mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
  SCSI: ARM: make fas216_dumpinfo function conditional
  SCSI: ARM: ncr5380/oak uses no interrupts
---

068a565afad3ae818cc0d5495479c4abccc7762c
diff --cc mm/slob.c
index a08e4681fd0d,497c55e318a1..1e921c5e9576
--- a/mm/slob.c
+++ b/mm/slob.c
@@@ -425,11 -425,10 +425,11 @@@ out
   * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
   */
  
 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 +static __always_inline void *
 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
  {
  	unsigned int *m;
- 	int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ 	int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
  	void *ret;
  
  	gfp &= gfp_allowed_mask;