BackPup/Linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 13:13:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'linus' into tracing/ftrace

Browse Source
This commit is contained in:
Ingo Molnar
2008-06-23 11:11:42 +02:00
parent ee4311adf1 481c5346d0
commit f34bfb1bee
284 changed files with 9946 additions and 5481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/asm-powerpc/mediabay.h
View File

@@ -17,8 +17,6 @@
#define MB_POWER 6 /* media bay contains a Power device (???) */
#define MB_NO 7 /* media bay contains nothing */
int check_media_bay(struct device_node *which_bay, int what);
/* Number of bays in the machine or 0 */
extern int media_bay_count;
@@ -29,6 +27,16 @@ int check_media_bay_by_base(unsigned long base, int what);
/* called by IDE PMAC host driver to register IDE controller for media bay */
int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base,
int irq, ide_hwif_t *hwif);
int check_media_bay(struct device_node *which_bay, int what);
#else
static inline int check_media_bay(struct device_node *which_bay, int what)
{
return -ENODEV;
}
#endif
#endif /* __KERNEL__ */

1
include/asm-powerpc/spu.h
View File

@@ -131,7 +131,6 @@ struct spu {
u64 flags;
u64 class_0_pending;
u64 class_0_dar;
u64 class_0_dsisr;
u64 class_1_dar;
u64 class_1_dsisr;
size_t ls_size;

2
include/asm-powerpc/spu_csa.h
View File

@@ -254,7 +254,7 @@ struct spu_state {
u64 spu_chnldata_RW[32];
u32 spu_mailbox_data[4];
u32 pu_mailbox_data[1];
u64 class_0_dar, class_0_dsisr, class_0_pending;
u64 class_0_dar, class_0_pending;
u64 class_1_dar, class_1_dsisr;
unsigned long suspend_time;
spinlock_t register_lock;

2
include/asm-powerpc/system.h
View File

@@ -34,7 +34,7 @@
* SMP since it is only used to order updates to system memory.
*/
#define mb() __asm__ __volatile__ ("sync" : : : "memory")
#define rmb() __asm__ __volatile__ (__stringify(LWSYNC) : : : "memory")
#define rmb() __asm__ __volatile__ ("sync" : : : "memory")
#define wmb() __asm__ __volatile__ ("sync" : : : "memory")
#define read_barrier_depends() do { } while(0)