Changeset cefb126 in mainline for kernel/arch/arm32/include/machine_func.h

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/arm32/include/machine_func.h (modified) (3 diffs)

kernel/arch/arm32/include/machine_func.h

@@ -46 +46 @@
 #include <arch/exception.h>
 
-#define MACHINE_GENFUNC machine_genfunc
-
 struct arm_machine_ops {
         void            (*machine_init)(void);
@@ -59 +57 @@
 };
 
-extern struct arm_machine_ops machine_ops;
+/** Pointer to arm_machine_ops structure being used. */
+extern struct arm_machine_ops *machine_ops;
 
+/** Initialize machine_ops pointer. */
+extern void machine_ops_init(void);
 
 /** Maps HW devices to the kernel address space using #hw_map. */
@@ -104 +105 @@
 extern void machine_input_init(void);
 
-extern void machine_genfunc(void);
 #endif