Commit 5f4197af authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] misc fixes

- ifdef fix in kmap_types.h (Oleg Drokin)

- remove redundant ext3 inclusions (Burton Windle)

- Fix misidentified warning printk in vmalloc.c

- radeon_cp printk warning fix (Randy Dunlap)

- Update minimum binutils version for the ".incbin" thing in vsyscall.S

- update raw driver to recent module API.

- update my email address
parent 4e3f87f6
...@@ -50,7 +50,7 @@ with pcmcia-cs. ...@@ -50,7 +50,7 @@ with pcmcia-cs.
o Gnu C 2.95.3 # gcc --version o Gnu C 2.95.3 # gcc --version
o Gnu make 3.78 # make --version o Gnu make 3.78 # make --version
o binutils 2.9.5.0.25 # ld -v o binutils 2.12 # ld -v
o util-linux 2.10o # fdformat --version o util-linux 2.10o # fdformat --version
o module-init-tools 0.9.9 # depmod -V o module-init-tools 0.9.9 # depmod -V
o e2fsprogs 1.29 # tune2fs o e2fsprogs 1.29 # tune2fs
......
...@@ -679,7 +679,7 @@ S: Maintained ...@@ -679,7 +679,7 @@ S: Maintained
EXT3 FILE SYSTEM EXT3 FILE SYSTEM
P: Stephen Tweedie, Andrew Morton P: Stephen Tweedie, Andrew Morton
M: sct@redhat.com, akpm@zip.com.au, adilger@clusterfs.com M: sct@redhat.com, akpm@digeo.com, adilger@clusterfs.com
L: ext3-users@redhat.com L: ext3-users@redhat.com
S: Maintained S: Maintained
...@@ -1257,7 +1257,7 @@ S: Maintained ...@@ -1257,7 +1257,7 @@ S: Maintained
NETWORK DEVICE DRIVERS NETWORK DEVICE DRIVERS
P: Andrew Morton P: Andrew Morton
M: akpm@zip.com.au M: akpm@digeo.com
P: Jeff Garzik P: Jeff Garzik
M: jgarzik@pobox.com M: jgarzik@pobox.com
L: linux-net@vger.kernel.org L: linux-net@vger.kernel.org
......
...@@ -903,8 +903,8 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, ...@@ -903,8 +903,8 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR, RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
entry->busaddr[page_ofs]); entry->busaddr[page_ofs]);
DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n", DRM_DEBUG( "ring rptr: offset=0x%08lx handle=0x%08lx\n",
entry->busaddr[page_ofs], (unsigned long) entry->busaddr[page_ofs],
entry->handle + tmp_ofs ); entry->handle + tmp_ofs );
} }
......
...@@ -181,7 +181,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp, ...@@ -181,7 +181,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
} }
if (rawdev->binding) { if (rawdev->binding) {
bdput(rawdev->binding); bdput(rawdev->binding);
MOD_DEC_USE_COUNT; module_put(THIS_MODULE);
} }
if (rq.block_major == 0 && rq.block_minor == 0) { if (rq.block_major == 0 && rq.block_minor == 0) {
/* unbind */ /* unbind */
...@@ -191,7 +191,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp, ...@@ -191,7 +191,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
if (rawdev->binding == NULL) if (rawdev->binding == NULL)
err = -ENOMEM; err = -ENOMEM;
else else
try_module_get(THIS_MODULE); __module_get(THIS_MODULE);
} }
up(&raw_mutex); up(&raw_mutex);
} else { } else {
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <linux/jbd.h> #include <linux/jbd.h>
#include <linux/ext3_fs.h> #include <linux/ext3_fs.h>
#include <linux/ext3_jbd.h> #include <linux/ext3_jbd.h>
#include <linux/jbd.h>
#include <linux/smp_lock.h>
/* /*
* akpm: A new design for ext3_sync_file(). * akpm: A new design for ext3_sync_file().
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <linux/config.h> #include <linux/config.h>
#if CONFIG_DEBUG_HIGHMEM #ifdef CONFIG_DEBUG_HIGHMEM
# define D(n) __KM_FENCE_##n , # define D(n) __KM_FENCE_##n ,
#else #else
# define D(n) # define D(n)
......
...@@ -97,8 +97,7 @@ static int map_area_pte(pte_t *pte, unsigned long address, ...@@ -97,8 +97,7 @@ static int map_area_pte(pte_t *pte, unsigned long address,
do { do {
struct page *page = **pages; struct page *page = **pages;
if (!pte_none(*pte)) WARN_ON(!pte_none(*pte));
printk(KERN_ERR "alloc_area_pte: page already exists\n");
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment