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 f060553..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__
 
 /*
@@ -86,7 +86,8 @@ struct machdep_calls {
        void            (*setup_arch)(void);
        void            (*init_early)(void);
        /* Optional, may be NULL. */
-       void            (*get_cpuinfo)(struct seq_file *m);
+       void            (*show_cpuinfo)(struct seq_file *m);
+       void            (*show_percpuinfo)(struct seq_file *m, int i);
 
        void            (*init_IRQ)(void);
        int             (*get_irq)(struct pt_regs *);
@@ -118,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);            
@@ -141,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);
 
@@ -153,10 +156,6 @@ struct machdep_calls {
        void            (*enable_pmcs)(void);
 
 #ifdef CONFIG_PPC32    /* XXX for now */
-       /* Optional, may be NULL. */
-       int             (*show_cpuinfo)(struct seq_file *m);
-       int             (*show_percpuinfo)(struct seq_file *m, int i);
-       
        /* A general init function, called by ppc_init in init/main.c.
           May be NULL. */
        void            (*init)(void);
@@ -168,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"
         */
@@ -286,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 */