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

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

Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix return value for sys_ipc
  microblaze: Storage class should be before const qualifier
parents 201517a7 c71a7a38

arch/microblaze/kernel/cpu/cpuinfo-static.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <asm/cpuinfo.h>

#include <asm/cpuinfo.h>

#include <asm/pvr.h>

#include <asm/pvr.h>





const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY;

static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY;

const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER;

static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER;





#define err_printk(x) \

#define err_printk(x) \

	early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n");

	early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n");

arch/microblaze/kernel/sys_microblaze.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ sys_ipc(uint call, int first, int second, int third, void *ptr, long fifth) 
		ret = sys_shmctl(first, second, (struct shmid_ds *) ptr);

		ret = sys_shmctl(first, second, (struct shmid_ds *) ptr);

		break;

		break;

	}

	}

	return -EINVAL;

	return ret;

}

}





asmlinkage int sys_vfork(struct pt_regs *regs)

asmlinkage int sys_vfork(struct pt_regs *regs)