From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrea Arcangeli <andrea@qumranet.com>
Subject: SIMPLE_ATTRIBUTE_GETTER compile fix
Date: Tue, 12 Feb 2008 12:52:55 +0100
Message-ID: <20080212115255.GQ7051@v2.random>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: Avi Kivity <avi@qumranet.com>
To: kvm-devel@lists.sourceforge.net
Return-path: <kvm-devel-bounces@lists.sourceforge.net>
Content-Disposition: inline
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=kvm-devel>
List-Post: <mailto:kvm-devel@lists.sourceforge.net>
List-Help: <mailto:kvm-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/kvm-devel>,
	<mailto:kvm-devel-request@lists.sourceforge.net?subject=subscribe>
Sender: kvm-devel-bounces@lists.sourceforge.net
Errors-To: kvm-devel-bounces@lists.sourceforge.net
List-Id: kvm.vger.kernel.org

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/