Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux

5 files changed, 13 insertions, 11 deletions

diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index a15a7ac2f6a3..9e2f1923ce5c 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -248,7 +248,7 @@ int ncp_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
 /* linux/fs/ncpfs/sock.c */
 int ncp_request2(struct ncp_server *server, int function,
 	void* reply, int max_reply_size);
-static int inline ncp_request(struct ncp_server *server, int function) {
+static inline int ncp_request(struct ncp_server *server, int function) {
 	return ncp_request2(server, function, server->packet, server->packet_size);
 }
 int ncp_connect(struct ncp_server *server);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 553864c6a5fb..7b693e39425f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -592,23 +592,23 @@ static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val)
 {
 	return pci_bus_read_config_byte (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
+static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
 {
 	return pci_bus_read_config_word (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_read_config_dword(struct pci_dev *dev, int where, u32 *val)
+static inline int pci_read_config_dword(struct pci_dev *dev, int where, u32 *val)
 {
 	return pci_bus_read_config_dword (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_byte(struct pci_dev *dev, int where, u8 val)
+static inline int pci_write_config_byte(struct pci_dev *dev, int where, u8 val)
 {
 	return pci_bus_write_config_byte (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_word(struct pci_dev *dev, int where, u16 val)
+static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val)
 {
 	return pci_bus_write_config_word (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_dword(struct pci_dev *dev, int where, u32 val)
+static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val)
 {
 	return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val);
 }
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 3d37e47dd968..74e53a04907e 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -244,7 +244,7 @@ static inline struct cache_head  *cache_get(struct cache_head *h)
 }
 
 
-static int inline cache_put(struct cache_head *h, struct cache_detail *cd)
+static inline int cache_put(struct cache_head *h, struct cache_detail *cd)
 {
 	atomic_dec(&h->refcnt);
 	if (!atomic_read(&h->refcnt) &&
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index cb36271f1376..9408ba6dbe34 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -171,7 +171,7 @@ xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
 	return vec->iov_len <= PAGE_SIZE;
 }
 
-static int inline svc_take_page(struct svc_rqst *rqstp)
+static inline int svc_take_page(struct svc_rqst *rqstp)
 {
 	if (rqstp->rq_arghi <= rqstp->rq_argused)
 		return -ENOMEM;
@@ -180,7 +180,7 @@ static int inline svc_take_page(struct svc_rqst *rqstp)
 	return 0;
 }
 
-static void inline svc_pushback_allpages(struct svc_rqst *rqstp)
+static inline void svc_pushback_allpages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
 		if (rqstp->rq_respages[--rqstp->rq_resused] == NULL)
@@ -191,7 +191,7 @@ static void inline svc_pushback_allpages(struct svc_rqst *rqstp)
 	}
 }
 
-static void inline svc_pushback_unused_pages(struct svc_rqst *rqstp)
+static inline void svc_pushback_unused_pages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
 		if (rqstp->rq_respages[--rqstp->rq_resused] != NULL) {
@@ -204,7 +204,7 @@ static void inline svc_pushback_unused_pages(struct svc_rqst *rqstp)
 	}
 }
 
-static void inline svc_free_allpages(struct svc_rqst *rqstp)
+static inline void svc_free_allpages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
 		if (rqstp->rq_respages[--rqstp->rq_resused] == NULL)
diff --git a/include/linux/types.h b/include/linux/types.h
index 87985824b16e..94ceb057eb64 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -6,6 +6,8 @@
 
 #define DECLARE_BITMAP(name,bits) \
 	unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
+#define CLEAR_BITMAP(name,bits) \
+	memset(name, 0, ((bits)+BITS_PER_LONG-1)/8)
 #endif
 
 #include <linux/posix_types.h>