Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3307f19f 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:
  sparc: remove some pointless conditionals before kfree()
  sbus: changed ioctls to unlocked
  sparc: asm/atomic.h on 32bit should include asm/system.h for xchg
  sparc64: Fix smp_callin() locking.
parents 5b1d07ed ed247e12

arch/sparc/include/asm/atomic_32.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


#ifdef __KERNEL__



#include <asm/system.h>



#define ATOMIC_INIT(i)  { (i) }



extern int __atomic_add_return(int, atomic_t *);

arch/sparc/kernel/ldc.c

+2 −4
Original line number Diff line number Diff line
@@ -1183,7 +1183,6 @@ out_free_txq: 
	free_queue(lp->tx_num_entries, lp->tx_base);



out_free_mssbuf:

	if (mssbuf)

	kfree(mssbuf);



out_free_iommu:
@@ -1217,7 +1216,6 @@ void ldc_free(struct ldc_channel *lp) 


	hlist_del(&lp->list);



	if (lp->mssbuf)

	kfree(lp->mssbuf);



	ldc_iommu_release(lp);

arch/sparc/kernel/smp_64.c

+2 −2
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ void __cpuinit smp_callin(void) 
	while (!cpu_isset(cpuid, smp_commenced_mask))

		rmb();



	ipi_call_lock();

	ipi_call_lock_irq();

	cpu_set(cpuid, cpu_online_map);

	ipi_call_unlock();

	ipi_call_unlock_irq();



	/* idle thread is expected to have preempt disabled */

	preempt_disable();

drivers/sbus/char/jsflash.c

+10 −5
Original line number Diff line number Diff line
@@ -383,18 +383,22 @@ static int jsf_ioctl_program(void __user *arg) 
	return 0;

}



static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd,

    unsigned long arg)

static long jsf_ioctl(struct file *f, unsigned int cmd, unsigned long arg)

{

	lock_kernel();

	int error = -ENOTTY;

	void __user *argp = (void __user *)arg;



	if (!capable(CAP_SYS_ADMIN))

	if (!capable(CAP_SYS_ADMIN)) {

		unlock_kernel();

		return -EPERM;

	}

	switch (cmd) {

	case JSFLASH_IDENT:

		if (copy_to_user(argp, &jsf0.id, JSFIDSZ))

		if (copy_to_user(argp, &jsf0.id, JSFIDSZ)) {

			unlock_kernel();

			return -EFAULT;

		}

		break;

	case JSFLASH_ERASE:

		error = jsf_ioctl_erase(arg);
@@ -404,6 +408,7 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd, 
		break;

	}



	unlock_kernel();

	return error;

}
@@ -439,7 +444,7 @@ static const struct file_operations jsf_fops = { 
	.llseek =	jsf_lseek,

	.read =		jsf_read,

	.write =	jsf_write,

	.ioctl =	jsf_ioctl,

	.unlocked_ioctl =	jsf_ioctl,

	.mmap =		jsf_mmap,

	.open =		jsf_open,

	.release =	jsf_release,

drivers/sbus/char/uctrl.c

+3 −4
Original line number Diff line number Diff line
@@ -197,9 +197,8 @@ static struct uctrl_driver { 
static void uctrl_get_event_status(struct uctrl_driver *);

static void uctrl_get_external_status(struct uctrl_driver *);



static int

uctrl_ioctl(struct inode *inode, struct file *file,

	      unsigned int cmd, unsigned long arg)

static long

uctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	switch (cmd) {

		default:
@@ -226,7 +225,7 @@ static irqreturn_t uctrl_interrupt(int irq, void *dev_id) 
static const struct file_operations uctrl_fops = {

	.owner =	THIS_MODULE,

	.llseek =	no_llseek,

	.ioctl =	uctrl_ioctl,

	.unlocked_ioctl =	uctrl_ioctl,

	.open =		uctrl_open,

};