Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / iseries / hvlog.c

diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c
index 48a3f7900389eb5593ebd782d1117bef4967d4b0..f476d71194fac1c0bebc9f5bcb8861ff71731fde 100644 (file)
--- a/arch/powerpc/platforms/iseries/hvlog.c
+++ b/arch/powerpc/platforms/iseries/hvlog.c
@@ -11,7 +11,7 @@
 #include <asm/abs_addr.h>
 #include <asm/iseries/hv_call.h>
 #include <asm/iseries/hv_call_sc.h>
-#include <asm/iSeries/HvTypes.h>
+#include <asm/iseries/hv_types.h>
 
 
 void HvCall_writeLogBuffer(const void *buffer, u64 len)
@@ -22,7 +22,7 @@ void HvCall_writeLogBuffer(const void *buffer, u64 len)
 
        while (len) {
                hv_buf.addr = cur;
-               left_this_page = ((cur & PAGE_MASK) + PAGE_SIZE) - cur;
+               left_this_page = ((cur & HW_PAGE_MASK) + HW_PAGE_SIZE) - cur;
                if (left_this_page > len)
                        left_this_page = len;
                hv_buf.len = left_this_page;
@@ -30,6 +30,6 @@ void HvCall_writeLogBuffer(const void *buffer, u64 len)
                HvCall2(HvCallBaseWriteLogBuffer,
                                virt_to_abs(&hv_buf),
                                left_this_page);
-               cur = (cur & PAGE_MASK) + PAGE_SIZE;
+               cur = (cur & HW_PAGE_MASK) + HW_PAGE_SIZE;
        }
 }