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

Commit 54e5bc02 authored by Andres Salomon's avatar Andres Salomon Committed by H. Peter Anvin
Browse files

x86, olpc: Constify an olpc_ofw() arg 



The arguments passed to OFW shouldn't be modified; update the 'args'
argument of olpc_ofw to reflect this.  This saves us some later
casting away of consts.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
LKML-Reference: <20100628220029.1555ac24@debian>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 25971865

arch/x86/include/asm/olpc_ofw.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#define olpc_ofw(name, args, res) \

	__olpc_ofw((name), ARRAY_SIZE(args), args, ARRAY_SIZE(res), res)



extern int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res,

extern int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,

		void **res);



/* determine whether OFW is available and lives in the proper memory */

arch/x86/kernel/olpc.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void __init platform_detect(void) 
{

	size_t propsize;

	__be32 rev;

	void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };

	const void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };

	void *res[] = { &propsize };



	if (olpc_ofw("getprop", args, res) || propsize != 4) {

arch/x86/kernel/olpc_ofw.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ void __init setup_olpc_ofw_pgd(void) 
	early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD);

}



int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res,

int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,

		void **res)

{

	int ofw_args[MAXARGS + 3];