From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Jan 2009 19:56:29 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
X-Git-Tag: v2.6.29-rc1~194
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=52fefcec97c25b15887e6a9a885ca54e7f7c0928;hp=-c;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Update platform files to reflect new location of the header files.
  xtensa: switch to packed struct unaligned access implementation
  xtensa: Add xt2000 support files.
  xtensa: move headers files to arch/xtensa/include
  xtensa: use the new byteorder headers
---

52fefcec97c25b15887e6a9a885ca54e7f7c0928
diff --combined arch/xtensa/include/asm/atomic.h
index 67ad67bed8c,b3b23540f14..67ad67bed8c
--- a/arch/xtensa/include/asm/atomic.h
+++ b/arch/xtensa/include/asm/atomic.h
@@@ -14,7 -14,8 +14,7 @@@
  #define _XTENSA_ATOMIC_H
  
  #include <linux/stringify.h>
 -
 -typedef struct { volatile int counter; } atomic_t;
 +#include <linux/types.h>
  
  #ifdef __KERNEL__
  #include <asm/processor.h>
diff --combined arch/xtensa/include/asm/bitops.h
index 6c3930397bd,23261e8f2e5..6c3930397bd
--- a/arch/xtensa/include/asm/bitops.h
+++ b/arch/xtensa/include/asm/bitops.h
@@@ -82,16 -82,6 +82,16 @@@ static inline int fls (unsigned int x
  	return 32 - __cntlz(x);
  }
  
 +/**
 + * __fls - find last (most-significant) set bit in a long word
 + * @word: the word to search
 + *
 + * Undefined if no set bit exists, so code should check against 0 first.
 + */
 +static inline unsigned long __fls(unsigned long word)
 +{
 +	return 31 - __cntlz(word);
 +}
  #else
  
  /* Use the generic implementation if we don't have the nsa/nsau instructions. */
@@@ -100,7 -90,6 +100,7 @@@
  # include <asm-generic/bitops/__ffs.h>
  # include <asm-generic/bitops/ffz.h>
  # include <asm-generic/bitops/fls.h>
 +# include <asm-generic/bitops/__fls.h>
  
  #endif
  
diff --combined arch/xtensa/platforms/iss/network.c
index 64f057d89e7,4eb36fd0f93..edad4156d89
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@@ -1,6 -1,6 +1,6 @@@
  /*
   *
-  * arch/xtensa/platform-iss/network.c
+  * arch/xtensa/platforms/iss/network.c
   *
   * Platform specific initialization.
   *
@@@ -33,7 -33,7 +33,7 @@@
  #include <linux/rtnetlink.h>
  #include <linux/platform_device.h>
  
- #include <asm/platform/simcall.h>
+ #include <platform/simcall.h>
  
  #define DRIVER_NAME "iss-netdev"
  #define ETH_MAX_PACKET 1500
@@@ -365,7 -365,7 +365,7 @@@ static int tuntap_probe(struct iss_net_
  
  static int iss_net_rx(struct net_device *dev)
  {
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	int pkt_len;
  	struct sk_buff *skb;
  
@@@ -456,7 -456,7 +456,7 @@@ static void iss_net_timer(unsigned lon
  
  static int iss_net_open(struct net_device *dev)
  {
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	char addr[sizeof "255.255.255.255\0"];
  	int err;
  
@@@ -496,7 -496,7 +496,7 @@@ out
  
  static int iss_net_close(struct net_device *dev)
  {
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  printk("iss_net_close!\n");
  	netif_stop_queue(dev);
  	spin_lock(&lp->lock);
@@@ -515,7 -515,7 +515,7 @@@
  
  static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	unsigned long flags;
  	int len;
  
@@@ -551,7 -551,7 +551,7 @@@
  
  static struct net_device_stats *iss_net_get_stats(struct net_device *dev)
  {
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	return &lp->stats;
  }
  
@@@ -578,7 -578,7 +578,7 @@@ static void iss_net_tx_timeout(struct n
  static int iss_net_set_mac(struct net_device *dev, void *addr)
  {
  #if 0
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	struct sockaddr *hwaddr = addr;
  
  	spin_lock(&lp->lock);
@@@ -592,7 -592,7 +592,7 @@@
  static int iss_net_change_mtu(struct net_device *dev, int new_mtu)
  {
  #if 0
 -	struct iss_net_private *lp = dev->priv;
 +	struct iss_net_private *lp = netdev_priv(dev);
  	int err = 0;
  
  	spin_lock(&lp->lock);
@@@ -636,7 -636,7 +636,7 @@@ static int iss_net_configure(int index
  
  	/* Initialize private element. */
  
 -	lp = dev->priv;
 +	lp = netdev_priv(dev);
  	*lp = ((struct iss_net_private) {
  		.device_list		= LIST_HEAD_INIT(lp->device_list),
  		.opened_list		= LIST_HEAD_INIT(lp->opened_list),
@@@ -660,7 -660,10 +660,7 @@@
  
  	printk(KERN_INFO "Netdevice %d ", index);
  	if (lp->have_mac)
 -		printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
 -				lp->mac[0], lp->mac[1],
 -				lp->mac[2], lp->mac[3],
 -				lp->mac[4], lp->mac[5]);
 +		printk("(%pM) ", lp->mac);
  	printk(": ");
  
  	/* sysfs register */