Changeset bd48f4c in mainline for kernel/arch/ppc32/include/cpu.h


Ignore:
Timestamp:
2010-07-12T10:53:30Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (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:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ppc32/include/cpu.h

    rc40e6ef rbd48f4c  
    5252
    5353#include <typedefs.h>
     54#include <trace.h>
    5455
    5556typedef struct {
    … …  
    5859} __attribute__ ((packed)) cpu_arch_t;
    5960
    60 static inline void cpu_version(cpu_arch_t *info)
     61NO_TRACE static inline void cpu_version(cpu_arch_t *info)
    6162{
    6263        asm volatile (
Note: See TracChangeset for help on using the changeset viewer.