Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (cf70a6f2) · Commits · e / devices / android_kernel_teracube_2e

arch/m68k/kernel/process.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,9 @@ void machine_power_off(void)
		for (;;);
		}

		void (*pm_power_off)(void) = machine_power_off;
		EXPORT_SYMBOL(pm_power_off);

		void show_regs(struct pt_regs * regs)
		{
		printk("\n");

+1 −9

Original line number	Diff line number	Diff line
		@@ -2082,9 +2082,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,

		SBP2_DEBUG("sbp2_check_sbp2_response");

		switch (SCpnt->cmnd[0]) {

		case INQUIRY:
		if (SCpnt->cmnd[0] == INQUIRY && (SCpnt->cmnd[1] & 3) == 0) {
		/*
		* Make sure data length is ok. Minimum length is 36 bytes
		*/
		@@ -2097,13 +2095,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
		*/
		scsi_buf[2] \|= 2;
		scsi_buf[3] = (scsi_buf[3] & 0xf0) \| 2;

		break;

		default:
		break;
		}
		return;
		}

		/*

+0 −4

Original line number	Diff line number	Diff line
		@@ -204,10 +204,6 @@ int proc_fill_super(struct super_block s, void data, int silent)
		root_inode = proc_get_inode(s, PROC_ROOT_INO, &proc_root);
		if (!root_inode)
		goto out_no_root;
		/*
		* Fixup the root inode's nlink value
		*/
		root_inode->i_nlink += nr_processes();
		root_inode->i_uid = 0;
		root_inode->i_gid = 0;
		s->s_root = d_alloc_root(root_inode);

+9 −8

Original line number	Diff line number	Diff line
		@@ -80,16 +80,16 @@ void __init proc_root_init(void)
		proc_bus = proc_mkdir("bus", NULL);
		}

		static struct dentry proc_root_lookup(struct inode dir, struct dentry * dentry, struct nameidata *nd)
		static int proc_root_getattr(struct vfsmount mnt, struct dentry dentry, struct kstat *stat
		)
		{
		/*
		* nr_threads is actually protected by the tasklist_lock;
		* however, it's conventional to do reads, especially for
		* reporting, without any locking whatsoever.
		*/
		if (dir->i_ino == PROC_ROOT_INO) /* check for safety... */
		dir->i_nlink = proc_root.nlink + nr_threads;
		generic_fillattr(dentry->d_inode, stat);
		stat->nlink = proc_root.nlink + nr_processes();
		return 0;
		}

		static struct dentry proc_root_lookup(struct inode dir, struct dentry * dentry, struct nameidata *nd)
		{
		if (!proc_lookup(dir, dentry, nd)) {
		return NULL;
		}
		@@ -134,6 +134,7 @@ static struct file_operations proc_root_operations = {
		*/
		static struct inode_operations proc_root_inode_operations = {
		.lookup = proc_root_lookup,
		.getattr = proc_root_getattr,
		};

		/*

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ static __inline__ int irq_canonicalize(int irq)

		extern void (*enable_irq)(unsigned int);
		extern void (*disable_irq)(unsigned int);
		#define enable_irq_nosync enable_irq
		#define disable_irq_nosync disable_irq

		struct pt_regs;