Changeset db71e2a in mainline for kernel/generic/include/mm/tlb.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• kernel/generic/include/mm/tlb.h (modified) (1 diff)

kernel/generic/include/mm/tlb.h

@@ -73 +73 @@
 extern void tlb_shootdown_ipi_recv(void);
 #else
-#define tlb_shootdown_start(w, x, y, z) (0)
-#define tlb_shootdown_finalize(i)       ((i) = (i));
+#define tlb_shootdown_start(w, x, y, z) interrupts_disable()    
+#define tlb_shootdown_finalize(i)       (interrupts_restore(i));
 #define tlb_shootdown_ipi_recv()
 #endif /* CONFIG_SMP */