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

Commit a92b166e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  zorro: Fix reading of proc/bus/zorro/* in small chunks
  zorro: BKL removal
  m68k/mac: Fix RTC on PMU machines
  m68k/mac: Add color classic ii support
  arch/m68k/sun3/leds.c: Checkpatch cleanup
parents 0d6ffdb8 2190a1e7

arch/m68k/mac/config.c

+9 −0
Original line number Diff line number Diff line
@@ -332,6 +332,15 @@ static struct mac_model mac_data_table[] = { 
		.scc_type	= MAC_SCC_II,

		.nubus_type	= MAC_NUBUS,

		.floppy_type	= MAC_FLOPPY_SWIM_ADDR2,

	}, {

		.ident		= MAC_MODEL_CCLII,

		.name		= "Color Classic II",

		.adb_type	= MAC_ADB_CUDA,

		.via_type	= MAC_VIA_IIci,

		.scsi_type	= MAC_SCSI_OLD,

		.scc_type	= MAC_SCC_II,

		.nubus_type	= MAC_NUBUS,

		.floppy_type	= MAC_FLOPPY_SWIM_ADDR2,

	},



	/*

arch/m68k/mac/misc.c

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data) 
#define cuda_write_pram NULL

#endif



#if 0 /* def CONFIG_ADB_PMU68K */

#ifdef CONFIG_ADB_PMU68K

static long pmu_read_time(void)

{

	struct adb_request req;
@@ -102,8 +102,8 @@ static long pmu_read_time(void) 
	while (!req.complete)

		pmu_poll();



	time = (req.reply[0] << 24) | (req.reply[1] << 16)

		| (req.reply[2] << 8) | req.reply[3];

	time = (req.reply[1] << 24) | (req.reply[2] << 16)

		| (req.reply[3] << 8) | req.reply[4];

	return time - RTC_OFFSET;

}

drivers/zorro/proc.c

+9 −8
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ static loff_t 
proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)

{

	loff_t new = -1;

	struct inode *inode = file->f_path.dentry->d_inode;



	lock_kernel();

	mutex_lock(&inode->i_mutex);

	switch (whence) {

	case 0:

		new = off;
@@ -35,12 +36,12 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence) 
		new = sizeof(struct ConfigDev) + off;

		break;

	}

	if (new < 0 || new > sizeof(struct ConfigDev)) {

		unlock_kernel();

		return -EINVAL;

	}

	unlock_kernel();

	return (file->f_pos = new);

	if (new < 0 || new > sizeof(struct ConfigDev))

		new = -EINVAL;

	else

		file->f_pos = new;

	mutex_unlock(&inode->i_mutex);

	return new;

}



static ssize_t
@@ -67,7 +68,7 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t * 
	cd.cd_BoardAddr = (void *)zorro_resource_start(z);

	cd.cd_BoardSize = zorro_resource_len(z);



	if (copy_to_user(buf, &cd, nbytes))

	if (copy_to_user(buf, (void *)&cd + pos, nbytes))

		return -EFAULT;

	*ppos += nbytes;

arch/m68k/sun3/leds.c

+2 −2

File changed.

Contains only whitespace changes.