SIMPLE_ATTRIBUTE_GETTER compile fix

SIMPLE_ATTRIBUTE_GETTER compile fix

[Andrea Arcangeli]

Hello,

this GETTER stuff looks a bit tricky... (we've just to cope with it).

Anyway this allows building again and perhaps there's something good
in the patch (not sure about the >= 2.6.25 side that I didn't touch)

Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>  

diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
index 3b45999..fe6108c 100644
--- a/kernel/external-module-compat.h
+++ b/kernel/external-module-compat.h
@@ -658,7 +664,7 @@ static inline struct page *__kvm_vm_fault(struct vm_area_struct *vma,
 	{				      \
 		u64 ret = 0;		      \
 					      \
-		__##x(v, &ret);		      \
+		__##x(v);		      \
 		return ret;		      \
 	}
 
diff --git a/kernel/hack-module.awk b/kernel/hack-module.awk
index 126957a..c98666e 100644
--- a/kernel/hack-module.awk
+++ b/kernel/hack-module.awk
@@ -40,7 +40,7 @@
     $0 = "\t.VMA_OPS_FAULT(fault) = VMA_OPS_FAULT_FUNC(" fcn "),"
 }
 
-/^static int .*_stat_get/ {
+/^static .*_stat_get/ {
     $3 = "__" $3
 }
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: SIMPLE_ATTRIBUTE_GETTER compile fix

[Avi Kivity]

Andrea Arcangeli wrote:
> Hello,
>
> this GETTER stuff looks a bit tricky... (we've just to cope with it).
>
> Anyway this allows building again and perhaps there's something good
> in the patch (not sure about the >= 2.6.25 side that I didn't touch)
>
> Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>  
>
> diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
> index 3b45999..fe6108c 100644
> --- a/kernel/external-module-compat.h
> +++ b/kernel/external-module-compat.h
> @@ -658,7 +664,7 @@ static inline struct page *__kvm_vm_fault(struct vm_area_struct *vma,
>  	{				      \
>  		u64 ret = 0;		      \
>  					      \
> -		__##x(v, &ret);		      \
> +		__##x(v);		      \
>  		return ret;		      \
>  	}
>   
But, getters are defined as

> static int vm_stat_get(void *_offset, u64 *val)

Perhaps you have an old kvm.git?

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: SIMPLE_ATTRIBUTE_GETTER compile fix

[Andrea Arcangeli]

On Tue, Feb 12, 2008 at 02:26:12PM +0200, Avi Kivity wrote:
> Perhaps you have an old kvm.git?

ouch good point! Ignore it then, I've been deferring any change to
kvm.git updates until I tracked down my kvm-userland troubles, I'll
try again after a kvm.git pull and I'll let you know if there's any
further trouble. Thanks!

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/