Commit 673b864f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  arch/sparc/mm: Use GFP_KERNEL
  MAINTAINERS: Add trailing slash to SBUS path.
  sbus: autoconvert trivial BKL users to private mutex
parents 93b9e9a2 71cd03b0

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5357,7 +5357,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git

S:	Maintained

F:	arch/sparc/

F:	drivers/sbus

F:	drivers/sbus/



SPARC SERIAL DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

arch/sparc/mm/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void __init sbus_iommu_init(struct of_device *op) 
	unsigned long *bitmap;

	unsigned long tmp;



	iommu = kmalloc(sizeof(struct iommu_struct), GFP_ATOMIC);

	iommu = kmalloc(sizeof(struct iommu_struct), GFP_KERNEL);

	if (!iommu) {

		prom_printf("Unable to allocate iommu structure\n");

		prom_halt();

drivers/sbus/char/display7seg.c

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/miscdevice.h>

#include <linux/ioport.h>		/* request_region */

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <asm/atomic.h>
@@ -26,6 +26,7 @@ 
#define DRIVER_NAME	"d7s"

#define PFX		DRIVER_NAME ": "



static DEFINE_MUTEX(d7s_mutex);

static int sol_compat = 0;		/* Solaris compatibility mode	*/



/* Solaris compatibility flag -
@@ -74,7 +75,6 @@ static int d7s_open(struct inode *inode, struct file *f) 
{

	if (D7S_MINOR != iminor(inode))

		return -ENODEV;

	cycle_kernel_lock();

	atomic_inc(&d7s_users);

	return 0;

}
@@ -110,7 +110,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))

		return -ENODEV;



	lock_kernel();

	mutex_lock(&d7s_mutex);

	switch (cmd) {

	case D7SIOCWR:

		/* assign device register values we mask-out D7S_FLIP
@@ -151,7 +151,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		writeb(regs, p->regs);

		break;

	};

	unlock_kernel();

	mutex_unlock(&d7s_mutex);



	return error;

}

drivers/sbus/char/envctrl.c

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/kmod.h>

#include <linux/reboot.h>

#include <linux/slab.h>

#include <linux/smp_lock.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -699,7 +698,6 @@ envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
static int

envctrl_open(struct inode *inode, struct file *file)

{

	cycle_kernel_lock();

	file->private_data = NULL;

	return 0;

}

drivers/sbus/char/flash.c

+8 −7
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/fcntl.h>

#include <linux/poll.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/spinlock.h>

#include <linux/mm.h>

#include <linux/of.h>
@@ -22,6 +22,7 @@ 
#include <asm/io.h>

#include <asm/upa.h>



static DEFINE_MUTEX(flash_mutex);

static DEFINE_SPINLOCK(flash_lock);

static struct {

	unsigned long read_base;	/* Physical read address */
@@ -80,7 +81,7 @@ flash_mmap(struct file *file, struct vm_area_struct *vma) 
static long long

flash_llseek(struct file *file, long long offset, int origin)

{

	lock_kernel();

	mutex_lock(&flash_mutex);

	switch (origin) {

		case 0:

			file->f_pos = offset;
@@ -94,10 +95,10 @@ flash_llseek(struct file *file, long long offset, int origin) 
			file->f_pos = flash.read_size;

			break;

		default:

			unlock_kernel();

			mutex_unlock(&flash_mutex);

			return -EINVAL;

	}

	unlock_kernel();

	mutex_unlock(&flash_mutex);

	return file->f_pos;

}
@@ -125,13 +126,13 @@ flash_read(struct file * file, char __user * buf, 
static int

flash_open(struct inode *inode, struct file *file)

{

	lock_kernel();

	mutex_lock(&flash_mutex);

	if (test_and_set_bit(0, (void *)&flash.busy) != 0) {

		unlock_kernel();

		mutex_unlock(&flash_mutex);

		return -EBUSY;

	}



	unlock_kernel();

	mutex_unlock(&flash_mutex);

	return 0;

}