TBH, I would have prefer to see a partial revert of the offending commit rather than mixing with logical changes like s/long/xen_ulong/.

I've pushed a branch with this review on top of master:
http://xenbits.xen.org/gitweb/?p=people/julieng/freebsd.git;a=shortlog;h=refs/heads/arcpatch-D3880

Changes in this version:

• Only consolidate xen-os.h
• Stray lines and whitespaces removed

I don't think we can get a rid of the linus copyright without re-writing the code because it has been copied from the Linux headers (arch/x86/include/asm/sync_bitops.h).

I uploaded the wrong version. The major change is in synch_cmpxgh where
the !amd64__ part was missing.

Fix coding style

Major changes:

• Add INTR_MPSAFE when mapping the event channel
• Split xen include from the system includes
• Check if the console is full before getting the characters from the tty (see xencons_getc)

Major changes:

• Fix coding style
• Introduce a set of operations per type of console
• Uniformize the function name