Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"

This commit is contained in:
Jean-Baptiste Queru
2010-10-19 14:49:28 -07:00
committed by Android Code Review

View File

@@ -158,6 +158,7 @@
/* Assembly-only macros */ /* Assembly-only macros */
#ifdef __ASSEMBLY__
/* define a handy PLD(address) macro since the cache preload /* define a handy PLD(address) macro since the cache preload
* is an optional opcode * is an optional opcode
@@ -168,4 +169,6 @@
# define PLD(reg,offset) /* nothing */ # define PLD(reg,offset) /* nothing */
#endif #endif
#endif /* ! __ASSEMBLY__ */
#endif /* _ARM_MACHINE_CPU_FEATURES_H */ #endif /* _ARM_MACHINE_CPU_FEATURES_H */