]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2e6e33b) | patch
[PATCH] sparc64: fix set_page_count merge clash
authorNick Piggin <npiggin@suse.de>
Thu, 23 Mar 2006 06:48:16 +0000 (07:48 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 23 Mar 2006 15:15:21 +0000 (07:15 -0800)
commitfcab1e51796d8bcd1a7969ff52bd904d38748e00
treeed2429321d8d12e9ec93fa2c0aec31fdc3d7b267tree | snapshot
parent2e6e33bab6e1996a5dec9108fb467b52b841e7a8commit | diff
[PATCH] sparc64: fix set_page_count merge clash

Merge clash will have broken sparc64. Synch up its online_page
implementation with powerpc, which was identical until the
set_page_count removal.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/sparc64/mm/init.c diff | blob | history
Linux 2.6 source tree