He is an updated, folded, version of the Linux Kernel Markers. It replaces theversion found in 2.6.21-mm2 at the exact same spot in the series file.

Main changes :- It renames the MARK() trace_mark(), as suggested by Christoph Hellwig.- It now defines the structures contained out of the marker section outside of the #ifdef __KERNEL__ so the SystemTAP tool can use the header to extract the markers from the kernel binary.- The i386 optimization has been tweaked a bit : the call is now in the else branch. It has something to do with the i386 "fast path" being the taken branch of a jump, to make loops faster. It seems that the if/else statements are also affected : the if () will be faster than the else. Therefore, I put the call in the else, to make sure the fastest path is when the marker is disabled.- I added the blktrace port to the markers infrastructure. It makes one in-tree markers user.Please remove :