git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
include
/
asm-ppc
/
machdep.h
diff --git
a/include/asm-ppc/machdep.h
b/include/asm-ppc/machdep.h
index
4ace72f
..
b78d408
100644
(file)
--- a/
include/asm-ppc/machdep.h
+++ b/
include/asm-ppc/machdep.h
@@
-5,6
+5,9
@@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/init.h>
+#include <asm/setup.h>
+#include <asm/page.h>
+
#ifdef CONFIG_APUS
#include <asm-m68k/machdep.h>
#endif
#ifdef CONFIG_APUS
#include <asm-m68k/machdep.h>
#endif
@@
-13,6
+16,7
@@
struct pt_regs;
struct pci_bus;
struct pci_dev;
struct seq_file;
struct pci_bus;
struct pci_dev;
struct seq_file;
+struct file;
/* We export this macro for external modules like Alsa to know if
* ppc_md.feature_call is implemented or not
/* We export this macro for external modules like Alsa to know if
* ppc_md.feature_call is implemented or not
@@
-54,6
+58,7
@@
struct machdep_calls {
unsigned long (*find_end_of_memory)(void);
void (*setup_io_mappings)(void);
unsigned long (*find_end_of_memory)(void);
void (*setup_io_mappings)(void);
+ void (*early_serial_map)(void);
void (*progress)(char *, unsigned short);
void (*kgdb_map_scc)(void);
void (*progress)(char *, unsigned short);
void (*kgdb_map_scc)(void);
@@
-90,6
+95,12
@@
struct machdep_calls {
/* Called at then very end of pcibios_init() */
void (*pcibios_after_init)(void);
/* Called at then very end of pcibios_init() */
void (*pcibios_after_init)(void);
+ /* Get access protection for /dev/mem */
+ pgprot_t (*phys_mem_access_prot)(struct file *file,
+ unsigned long offset,
+ unsigned long size,
+ pgprot_t vma_prot);
+
/* this is for modules, since _machine can be a define -- Cort */
int ppc_machine;
/* this is for modules, since _machine can be a define -- Cort */
int ppc_machine;
@@
-106,7
+117,6
@@
struct machdep_calls {
};
extern struct machdep_calls ppc_md;
};
extern struct machdep_calls ppc_md;
-#define COMMAND_LINE_SIZE 512
extern char cmd_line[COMMAND_LINE_SIZE];
extern void setup_pci_ptrs(void);
extern char cmd_line[COMMAND_LINE_SIZE];
extern void setup_pci_ptrs(void);
@@
-119,6
+129,7
@@
typedef enum sys_ctrler_kind {
SYS_CTRLER_UNKNOWN = 0,
SYS_CTRLER_CUDA = 1,
SYS_CTRLER_PMU = 2,
SYS_CTRLER_UNKNOWN = 0,
SYS_CTRLER_CUDA = 1,
SYS_CTRLER_PMU = 2,
+ SYS_CTRLER_SMU = 3,
} sys_ctrler_t;
extern sys_ctrler_t sys_ctrler;
} sys_ctrler_t;
extern sys_ctrler_t sys_ctrler;