Changeset 371bd7d in mainline for kernel/arch/ppc32/include/asm.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/ppc32/include/asm.h (modified) (3 diffs)

kernel/arch/ppc32/include/asm.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ppc32_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
@@ -146 +145 @@
 }
 
-void cpu_halt(void);
-void asm_delay_loop(uint32_t t);
-
+extern void cpu_halt(void) __attribute__((noreturn));
+extern void asm_delay_loop(uint32_t t);
 extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
 static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-        *port = v;      
+        *port = v;
 }
 
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        return *port; 
+        return *port;
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        return *port; 
+        return *port;
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        return *port; 
+        return *port;
 }