powerpc: fix __strnlen_user in merge tree

[powerpc.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 8a0969b..451b345 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -1,5 +1,5 @@
-#ifndef _PPC64_MACHDEP_H
-#define _PPC64_MACHDEP_H
+#ifndef _ASM_POWERPC_MACHDEP_H
+#define _ASM_POWERPC_MACHDEP_H
 #ifdef __KERNEL__
 
 /*
@@ -119,6 +119,8 @@ struct machdep_calls {
        /* Interface for platform error logging */
        void            (*log_error)(char *buf, unsigned int err_type, int fatal);
 
+       unsigned char   (*nvram_read_val)(int addr);
+       void            (*nvram_write_val)(int addr, unsigned char val);
        ssize_t         (*nvram_write)(char *buf, size_t count, loff_t *index);
        ssize_t         (*nvram_read)(char *buf, size_t count, loff_t *index);  
        ssize_t         (*nvram_size)(void);            
@@ -142,7 +144,7 @@ struct machdep_calls {
        
        /* Get access protection for /dev/mem */
        pgprot_t        (*phys_mem_access_prot)(struct file *file,
-                                               unsigned long offset,
+                                               unsigned long pfn,
                                                unsigned long size,
                                                pgprot_t vma_prot);
 
@@ -165,15 +167,11 @@ struct machdep_calls {
        unsigned long   heartbeat_reset;
        unsigned long   heartbeat_count;
 
-       unsigned long   (*find_end_of_memory)(void);
        void            (*setup_io_mappings)(void);
 
        void            (*early_serial_map)(void);
        void            (*kgdb_map_scc)(void);
 
-       unsigned char   (*nvram_read_val)(int addr);
-       void            (*nvram_write_val)(int addr, unsigned char val);
-
        /*
         * optional PCI "hooks"
         */
@@ -283,4 +281,4 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
 }
 
 #endif /* __KERNEL__ */
-#endif /* _PPC64_MACHDEP_H */
+#endif /* _ASM_POWERPC_MACHDEP_H */