Merge samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/for-alan

10 files changed, 62 insertions, 119 deletions

diff --git a/include/linux/acct.h b/include/linux/acct.h
index fb0a19dc8ab3..0b4ae8298a0e 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -76,6 +76,7 @@ struct acct
 #include <linux/config.h>
 
 #ifdef CONFIG_BSD_PROCESS_ACCT
+struct super_block;
 extern void acct_auto_close(struct super_block *sb);
 extern int acct_process(long exitcode);
 #else
diff --git a/include/linux/compat.h b/include/linux/compat.h
new file mode 100644
index 000000000000..5aa29316f9d8
--- /dev/null
+++ b/include/linux/compat.h
@@ -0,0 +1,24 @@
+#ifndef _LINUX_COMPAT_H
+#define _LINUX_COMPAT_H
+/*
+ * These are the type definitions for the arhitecure sepcific
+ * compatibility layer.
+ */
+#include <linux/config.h>
+
+#ifdef CONFIG_COMPAT
+
+#include <asm/compat.h>
+
+struct compat_utimbuf {
+	compat_time_t		actime;
+	compat_time_t		modtime;
+};
+
+struct compat_itimerval {
+	struct compat_timeval	it_interval;
+	struct compat_timeval	it_value;
+};
+
+#endif /* CONFIG_COMPAT */
+#endif /* _LINUX_COMPAT_H */
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 960e54133e29..f82c74decefe 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -58,7 +58,6 @@
  */
 #define CRYPTO_UNSPEC			0
 #define CRYPTO_MAX_ALG_NAME		64
-#define CRYPTO_MAX_CIPHER_BLOCK_SIZE	16
 
 struct scatterlist;
 
@@ -135,6 +134,7 @@ struct cipher_tfm {
 	                   struct scatterlist *sg, unsigned int nsg);
 	int (*cit_decrypt)(struct crypto_tfm *tfm,
 	                   struct scatterlist *sg, unsigned int nsg);
+	void (*cit_xor_block)(u8 *dst, const u8 *src);
 };
 
 struct digest_tfm {
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index 61ca61ae895c..15c85cccdded 100644
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -11,23 +11,10 @@
 
 #define DEVFS_SUPER_MAGIC                0x1373
 
-#define IS_DEVFS_INODE(inode) (DEVFS_SUPER_MAGIC == (inode)->i_sb->s_magic)
-
-#define DEVFS_MINOR(inode) \
-    ({unsigned int m; /* evil GCC trickery */ \
-      ((inode)->i_sb && \
-       ((inode)->i_sb->s_magic==DEVFS_SUPER_MAGIC) && \
-       (devfs_get_maj_min(devfs_get_handle_from_inode((inode)),NULL,&m)==0) \
-      ) ? m : MINOR((inode)->r_dev); })
-
-
 #define DEVFS_FL_NONE           0x000 /* This helps to make code more readable
 				       */
-#define DEVFS_FL_HIDE           0x001 /* Do not show entry in directory list */
 #define DEVFS_FL_AUTO_DEVNUM    0x002 /* Automatically generate device number
 				       */
-#define DEVFS_FL_AOPEN_NOTIFY   0x004 /* Asynchronously notify devfsd on open
-				       */
 #define DEVFS_FL_REMOVABLE      0x008 /* This is a removable media device    */
 #define DEVFS_FL_WAIT           0x010 /* Wait for devfsd to finish           */
 #define DEVFS_FL_CURRENT_OWNER  0x020 /* Set initial ownership to current    */
@@ -67,40 +54,23 @@ extern int devfs_mk_symlink (devfs_handle_t dir, const char *name,
 extern devfs_handle_t devfs_mk_dir (devfs_handle_t dir, const char *name,
 				    void *info);
 extern devfs_handle_t devfs_get_handle (devfs_handle_t dir, const char *name,
-					unsigned int major,unsigned int minor,
-					char type, int traverse_symlinks);
-extern void devfs_find_and_unregister (devfs_handle_t dir, const char *name,
-				       unsigned int major, unsigned int minor,
-				       char type, int traverse_symlinks);
-extern int devfs_get_flags (devfs_handle_t de, unsigned int *flags);
-extern int devfs_set_flags (devfs_handle_t de, unsigned int flags);
-extern int devfs_get_maj_min (devfs_handle_t de, 
-			      unsigned int *major, unsigned int *minor);
+					int traverse_symlinks);
 extern devfs_handle_t devfs_get_handle_from_inode (struct inode *inode);
 extern int devfs_generate_path (devfs_handle_t de, char *path, int buflen);
-extern void *devfs_get_ops (devfs_handle_t de);
-extern void devfs_put_ops (devfs_handle_t de);
 extern int devfs_set_file_size (devfs_handle_t de, unsigned long size);
 extern void *devfs_get_info (devfs_handle_t de);
 extern int devfs_set_info (devfs_handle_t de, void *info);
 extern devfs_handle_t devfs_get_parent (devfs_handle_t de);
 extern devfs_handle_t devfs_get_first_child (devfs_handle_t de);
 extern devfs_handle_t devfs_get_next_sibling (devfs_handle_t de);
-extern void devfs_auto_unregister (devfs_handle_t master,devfs_handle_t slave);
-extern devfs_handle_t devfs_get_unregister_slave (devfs_handle_t master);
 extern const char *devfs_get_name (devfs_handle_t de, unsigned int *namelen);
 extern int devfs_only (void);
 extern int devfs_register_tape (devfs_handle_t de);
 extern void devfs_unregister_tape(int num);
-extern void devfs_register_series (devfs_handle_t dir, const char *format,
-				   unsigned int num_entries,
-				   unsigned int flags, unsigned int major,
-				   unsigned int minor_start,
-				   umode_t mode, void *ops, void *info);
 extern int devfs_alloc_major (char type);
 extern void devfs_dealloc_major (char type, int major);
-extern kdev_t devfs_alloc_devnum (char type);
-extern void devfs_dealloc_devnum (char type, kdev_t devnum);
+extern dev_t devfs_alloc_devnum (char type);
+extern void devfs_dealloc_devnum (char type, dev_t devnum);
 extern int devfs_alloc_unique_number (struct unique_numspace *space);
 extern void devfs_dealloc_unique_number (struct unique_numspace *space,
 					 int number);
@@ -147,36 +117,13 @@ static inline devfs_handle_t devfs_mk_dir (devfs_handle_t dir,
 }
 static inline devfs_handle_t devfs_get_handle (devfs_handle_t dir,
 					       const char *name,
-					       unsigned int major,
-					       unsigned int minor,
-					       char type,
 					       int traverse_symlinks)
 {
     return NULL;
 }
-static inline void devfs_find_and_unregister (devfs_handle_t dir,
-					      const char *name,
-					      unsigned int major,
-					      unsigned int minor,
-					      char type, int traverse_symlinks)
-{
-}
 static inline void devfs_remove(const char *fmt, ...)
 {
 }
-static inline int devfs_get_flags (devfs_handle_t de, unsigned int *flags)
-{
-    return 0;
-}
-static inline int devfs_set_flags (devfs_handle_t de, unsigned int flags)
-{
-    return 0;
-}
-static inline int devfs_get_maj_min (devfs_handle_t de, 
-				     unsigned int *major, unsigned int *minor)
-{
-    return 0;
-}
 static inline devfs_handle_t devfs_get_handle_from_inode (struct inode *inode)
 {
     return NULL;
@@ -186,14 +133,6 @@ static inline int devfs_generate_path (devfs_handle_t de, char *path,
 {
     return -ENOSYS;
 }
-static inline void *devfs_get_ops (devfs_handle_t de)
-{
-    return NULL;
-}
-static inline void devfs_put_ops (devfs_handle_t de)
-{
-    return;
-}
 static inline int devfs_set_file_size (devfs_handle_t de, unsigned long size)
 {
     return -ENOSYS;
@@ -218,15 +157,6 @@ static inline devfs_handle_t devfs_get_next_sibling (devfs_handle_t de)
 {
     return NULL;
 }
-static inline void devfs_auto_unregister (devfs_handle_t master,
-					  devfs_handle_t slave)
-{
-    return;
-}
-static inline devfs_handle_t devfs_get_unregister_slave (devfs_handle_t master)
-{
-    return NULL;
-}
 static inline const char *devfs_get_name (devfs_handle_t de,
 					  unsigned int *namelen)
 {
@@ -243,17 +173,6 @@ static inline int devfs_register_tape (devfs_handle_t de)
 static inline void devfs_unregister_tape(int num)
 {
 }
-static inline void devfs_register_series (devfs_handle_t dir,
-					  const char *format,
-					  unsigned int num_entries,
-					  unsigned int flags,
-					  unsigned int major,
-					  unsigned int minor_start,
-					  umode_t mode, void *ops, void *info)
-{
-    return;
-}
-
 static inline int devfs_alloc_major (char type)
 {
     return -1;
@@ -264,12 +183,12 @@ static inline void devfs_dealloc_major (char type, int major)
     return;
 }
 
-static inline kdev_t devfs_alloc_devnum (char type)
+static inline dev_t devfs_alloc_devnum (char type)
 {
-    return NODEV;
+    return 0;
 }
 
-static inline void devfs_dealloc_devnum (char type, kdev_t devnum)
+static inline void devfs_dealloc_devnum (char type, dev_t devnum)
 {
     return;
 }
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d1782a6bd008..cda1c818f68c 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -369,8 +369,6 @@ struct fb_info {
    struct vc_data *display_fg;		/* Console visible on this display */
    int currcon;				/* Current VC. */	
    char fontname[40];			/* default font name */
-   devfs_handle_t devfs_handle;         /* Devfs handle for new name         */
-   devfs_handle_t devfs_lhandle;        /* Devfs handle for compat. symlink  */
    int (*changevar)(int);		/* tell console var has changed */
    int (*switch_con)(int, struct fb_info*);
 					/* tell fb to switch consoles */
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 2f429e27a007..3715eff60725 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -408,14 +408,6 @@ typedef struct isdn_devt {
 	struct task_struct *profd;                   /* For iprofd                 */
 	struct semaphore  sem;                       /* serialize list access*/
 	unsigned long     global_features;
-#ifdef CONFIG_DEVFS_FS
-	devfs_handle_t devfs_handle_isdninfo;
-	devfs_handle_t devfs_handle_isdnctrl;
-	devfs_handle_t devfs_handle_isdnctrlX[ISDN_MAX_CHANNELS];
-#ifdef CONFIG_ISDN_PPP
-	devfs_handle_t devfs_handle_ipppX[ISDN_MAX_CHANNELS];
-#endif
-#endif /* CONFIG_DEVFS_FS */
 } isdn_dev;
 
 extern isdn_dev *dev;
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index e5b21ce0a07b..f568f979bbdf 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -126,6 +126,8 @@ struct igmpmsg
  */
 
 #ifdef __KERNEL__
+#include <net/sock.h>
+
 extern int ip_mroute_setsockopt(struct sock *, int, char *, int);
 extern int ip_mroute_getsockopt(struct sock *, int, char *, int *);
 extern int ipmr_ioctl(struct sock *sk, int cmd, unsigned long arg);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f2c8daf526aa..513b89ca7836 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -207,7 +207,8 @@ enum netdev_state_t
 	__LINK_STATE_PRESENT,
 	__LINK_STATE_SCHED,
 	__LINK_STATE_NOCARRIER,
-	__LINK_STATE_RX_SCHED
+	__LINK_STATE_RX_SCHED,
+	__LINK_STATE_LINKWATCH_PENDING
 };
 
 
@@ -631,6 +632,8 @@ static inline void dev_put(struct net_device *dev)
  * who is responsible for serialization of these calls.
  */
 
+extern void linkwatch_fire_event(struct net_device *dev);
+
 static inline int netif_carrier_ok(struct net_device *dev)
 {
 	return !test_bit(__LINK_STATE_NOCARRIER, &dev->state);
@@ -640,14 +643,16 @@ extern void __netdev_watchdog_up(struct net_device *dev);
 
 static inline void netif_carrier_on(struct net_device *dev)
 {
-	clear_bit(__LINK_STATE_NOCARRIER, &dev->state);
+	if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
+		linkwatch_fire_event(dev);
 	if (netif_running(dev))
 		__netdev_watchdog_up(dev);
 }
 
 static inline void netif_carrier_off(struct net_device *dev)
 {
-	set_bit(__LINK_STATE_NOCARRIER, &dev->state);
+	if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
+		linkwatch_fire_event(dev);
 }
 
 /* Hot-plugging. */
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 6f1a3d936535..9841fd436cfe 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -2062,12 +2062,12 @@ extern inline int reiserfs_new_form_blocknrs (struct tree_balance * tb,
 					      b_blocknr_t *new_blocknrs, int amount_needed)
 {
     reiserfs_blocknr_hint_t hint = {
-	th:tb->transaction_handle,
-	path: tb->tb_path,
-	inode: NULL,
-	key: tb->key,
-	block: 0,
-	formatted_node:1
+	.th = tb->transaction_handle,
+	.path = tb->tb_path,
+	.inode = NULL,
+	.key = tb->key,
+	.block = 0,
+	.formatted_node = 1
     };
     return reiserfs_allocate_blocknrs(&hint, new_blocknrs, amount_needed, 0);
 }
@@ -2077,12 +2077,12 @@ extern inline int reiserfs_new_unf_blocknrs (struct reiserfs_transaction_handle
 					     struct path * path, long block)
 {
     reiserfs_blocknr_hint_t hint = {
-	th: th,
-	path: path,
-	inode: NULL,
-	block: block,
-	formatted_node: 0,
-	preallocate: 0
+	.th = th,
+	.path = path,
+	.inode = NULL,
+	.block = block,
+	.formatted_node = 0,
+	.preallocate = 0
     };
     return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
 }
@@ -2094,12 +2094,12 @@ extern inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle
 					     struct path * path, long block)
 {
     reiserfs_blocknr_hint_t hint = {
-	th: th,
-	path: path,
-	inode: inode,
-	block: block,
-	formatted_node: 0,
-	preallocate: 1
+	.th = th,
+	.path = path,
+	.inode = inode,
+	.block = block,
+	.formatted_node = 0,
+	.preallocate = 1
     };
     return reiserfs_allocate_blocknrs(&hint, new_blocknrs, 1, 0);
 }
diff --git a/include/linux/time.h b/include/linux/time.h
index eac6adc31dab..52d60ec2b364 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -138,6 +138,8 @@ struct timespec current_kernel_time(void);
 #ifdef __KERNEL__
 extern void do_gettimeofday(struct timeval *tv);
 extern void do_settimeofday(struct timeval *tv);
+extern long do_nanosleep(struct timespec *t);
+extern long do_utimes(char * filename, struct timeval * times);
 #endif
 
 #define FD_SETSIZE		__FD_SETSIZE