---

yaml --- r: 93975 b: refs/heads/master c: ddc81ed h: refs/heads/master i: 93973: 30578d5 93971: 1d6c1f0 93967: 4f67325 v: v3
git-mirror · Apr 28, 2008 · 883c92e · 883c92e
1 parent 56399a3
commit 883c92e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488514d1798289f56f80ed018e246179fe500383
+refs/heads/master: ddc81ed2c5d47a078a3b02c5c3a4345bc2bc3c9b
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
@@ -637,9 +637,10 @@ static inline int is_normal_idx(enum zone_type idx)
 static inline int is_highmem(struct zone *zone)
 {
 #ifdef CONFIG_HIGHMEM
-	int zone_idx = zone - zone->zone_pgdat->node_zones;
-	return zone_idx == ZONE_HIGHMEM ||
-		(zone_idx == ZONE_MOVABLE && zone_movable_is_highmem());
+	int zone_off = (char *)zone - (char *)zone->zone_pgdat->node_zones;
+	return zone_off == ZONE_HIGHMEM * sizeof(*zone) ||
+	       (zone_off == ZONE_MOVABLE * sizeof(*zone) &&
+		zone_movable_is_highmem());
 #else
 	return 0;
 #endif