From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LAqy5-0001Ng-4I
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:13:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LAqy4-0001Mh-Hl
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:13:00 -0500
Received: from [199.232.76.173] (port=57772 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LAqy4-0001MV-Dr
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:13:00 -0500
Received: from savannah.gnu.org ([199.232.41.3]:59065 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LAqy4-0005k1-6E
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 14:13:00 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LAqy3-0001BJ-Lc
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:12:59 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1LAqy3-0001BE-E3
	for qemu-devel@nongnu.org; Thu, 11 Dec 2008 19:12:59 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1LAqy3-0001BE-E3@cvs.savannah.gnu.org>
Date: Thu, 11 Dec 2008 19:12:59 +0000
Subject: [Qemu-devel] [5980] Don't require linux/auxvec.h,
 which isn't always installed with libc .
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5980
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5980
Author:   malc
Date:     2008-12-11 19:12:59 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
Don't require linux/auxvec.h, which isn't always installed with libc.

I'm cross-compiling, and linux/auxvec.h was not installed with my glibc
headers. How about this:

Don't require linux/auxvec.h, which isn't always installed with libc.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

Modified Paths:
--------------
    trunk/cache-utils.c

Modified: trunk/cache-utils.c
===================================================================
--- trunk/cache-utils.c	2008-12-11 19:12:25 UTC (rev 5979)
+++ trunk/cache-utils.c	2008-12-11 19:12:59 UTC (rev 5980)
@@ -16,18 +16,21 @@
 }
 
 #elif defined __linux__
-#include <linux/auxvec.h>
 
+#define QEMU_AT_NULL        0
+#define QEMU_AT_DCACHEBSIZE 19
+#define QEMU_AT_ICACHEBSIZE 20
+
 static void ppc_init_cacheline_sizes(char **envp)
 {
     unsigned long *auxv;
 
     while (*envp++);
 
-    for (auxv = (unsigned long *) envp; *auxv != AT_NULL; auxv += 2) {
+    for (auxv = (unsigned long *) envp; *auxv != QEMU_AT_NULL; auxv += 2) {
         switch (*auxv) {
-        case AT_DCACHEBSIZE: qemu_cache_conf.dcache_bsize = auxv[1]; break;
-        case AT_ICACHEBSIZE: qemu_cache_conf.icache_bsize = auxv[1]; break;
+        case QEMU_AT_DCACHEBSIZE: qemu_cache_conf.dcache_bsize = auxv[1]; break
+        case QEMU_AT_ICACHEBSIZE: qemu_cache_conf.icache_bsize = auxv[1]; break
         default: break;
         }
     }