diff --git a/.topdeps b/.topdeps index 607c231780..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1 @@ -gcc-branch -fix-branch -feature-branch +zfs-branch diff --git a/.topmsg b/.topmsg index 03967cdff5..be5391622d 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,6 @@ From: Brian Behlendorf -Subject: [PATCH] zfs branch +Subject: [PATCH] linux arc -Merged result of all changes which are relevant to both Solaris -and Linux builds of the ZFS code. These are changes where there -is a reasonable chance they will be accepted upstream. - -Additionally, since this is effectively the root of the linux -ZFS tree the core linux build system is added here. This -includes autogen.sh, configure.ac, m4 macros, some scripts/*, -and makefiles for all the core ZFS components. Linux-only -features which require tweaks to the build system should appear -on the relevant topic branches. All autotools products which -result from autogen.sh are commited to the linux-configure-branch. - -This branch also contains the META, ChangeLog, AUTHORS, TODO, -and README, files. +Linux VM arc integration. Signed-off-by: Brian Behlendorf diff --git a/module/zfs/arc.c b/module/zfs/arc.c index ace79ad0ad..b416907b65 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -3437,7 +3437,7 @@ arc_init(void) /* Start out with 1/8 of all memory */ arc_c = physmem * PAGESIZE / 8; -#ifdef _KERNEL +#if defined(_KERNEL) && defined(__i386) /* * On architectures where the physical memory can be larger * than the addressable space (intel in 32-bit mode), we may