[SCM] GNU Mach branch, master-x86_64, updated. 41cc4c0d246e842acf9f83d2195dd4e286e25be3

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mach".

The branch, master-x86_64 has been updated
       via  41cc4c0d246e842acf9f83d2195dd4e286e25be3 (commit)
       via  8d382f877fea34ed25d26110dfd85e18ca2e10f6 (commit)
       via  3e02e55b9381d0354674c1fcc31676ca0470c5ad (commit)
       via  a8abecc75ea49fc883aec5c7f1e2df1555100a9b (commit)
       via  23bb836a44fd2331cfed244a091dbff0aa458d13 (commit)
       via  6e4113dbceed9d02a4359a8675623abd02822a9a (commit)
       via  3f1e0cf0557f3148bdd97c4088093fd83e494af5 (commit)
       via  e07d6c4995c384be14130bf178989427a4291ded (commit)
       via  6b010591cb94032a6fef2cb81bed16446f31f8b6 (commit)
       via  8bb723b45c225eebc3c92b8d4632eaee50b0e496 (commit)
       via  377805c5a1eb8625855b954acc0f636d16d4bec9 (commit)
       via  ce99076635d342a1f6ae1c3b781638c04372df3d (commit)
       via  28d83087776ebdad43a11fa3e687859462de4542 (commit)
       via  338d9ca7981f25099d99d280b0dd3af590d65763 (commit)
       via  2a6b4fc29ad57a2d9127fd4095f60238ba370cab (commit)
       via  b47af4d4d069c12fd79e588615fa0df04bbccff7 (commit)
       via  beda83efaa45fb04f142034f61eb1ae9fe872c59 (commit)
       via  64cd914cf46ce29d032a155bde3265ff5339cc61 (commit)
       via  dd961d1cef715b4c1e4fedd2f43fae6703f128ba (commit)
       via  392239d8c9979ac95c122b77d5d1e012f216d2ec (commit)
       via  8015e7817b505d15845c33f13c24ad55c561c8df (commit)
       via  14a29498dfee39e72443ff0e6f463be7f3bfd4ec (commit)
       via  81f8c8607d6ffcfdfb47cfa3b1cd2b55a4577218 (commit)
       via  769b0946b81a11ea495d94cdf6768837a3602998 (commit)
       via  4133b7f7992a38b19d5bfe47591e932e92d958e8 (commit)
       via  db8ec819c3863040aceae97ab35ef5c6ef3c898f (commit)
       via  07a7f30953c6ab3de4362bfd7925cfb2ded23fda (commit)
       via  3ff73e57ae6b7aaa3ef0e5549821ea359b96f90c (commit)
       via  4133164b09e3c75bd5d6b72ef4661ca92ffd387b (commit)
       via  7aa475db4ce168401167dc2ffed6221493ae2db4 (commit)
       via  bdae52f1465743ad96b2261e053ae4967f807557 (commit)
       via  45c4266eceeb35d20a0c74b4cd85510a0e3bf385 (commit)
       via  19ad2bd5f22161d4fe2b089d5a5945f83ac30ad7 (commit)
       via  231bf35d3ddfee7f03055220e45633cf138ea10a (commit)
       via  661b742e292d88dbc70255109e978ec77a91a6e2 (commit)
       via  0ec3a87748d9e90d21116038e386cace5ea4a460 (commit)
       via  a564ecbc2cb4441ebac32ac5300bc7840569eb30 (commit)
       via  9eacb0eab6eb8e35bb26ab3db660973fddf9e8fb (commit)
       via  f5f6f62357b90e1ce1eb24f2929314b0d84078d0 (commit)
       via  d59b5731eaa93348485e2ae77e9b5d90fb1da36b (commit)
       via  8d219eab0dcfbdcf464340630d568c4e16d7acbd (commit)
       via  27150b21c3366d6b474fe3e69140ecac65ab7ed2 (commit)
       via  43d2ad0d2043a278a2772519013f25a0bc4b067f (commit)
       via  2d2da4aad582bf1d63554cd9496285787db3e66e (commit)
       via  9c7d81dd1b033b112716916be37b8a8960f7413b (commit)
       via  c3d905cfb9486eb1d2887fe8167f038c57fa0bb6 (commit)
       via  4e95ccf97e0d6ef22849a36061a1d39586eea449 (commit)
      from  2988b03258b7232edb8d03529ca92d766d190cf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 41cc4c0d246e842acf9f83d2195dd4e286e25be3
Merge: 2988b03 8d382f8
Author: Samuel Thibault <address@hidden>
Date:   Sat Feb 2 15:58:16 2013 +0100

    Merge branch 'master' into master-x86_64
    
    Conflicts:
        i386/i386/gdt.c
        i386/i386/vm_param.h
        i386/intel/pmap.c
        kern/ipc_kobject.c

-----------------------------------------------------------------------

Summary of changes:
 Makefrag.am                         |    8 +
 ddb/db_output.h                     |    6 +-
 i386/i386/fpu.c                     |   20 +-
 i386/i386/gdt.c                     |   22 +-
 i386/i386/gdt.h                     |    8 +-
 i386/i386/i386asm.sym               |    8 +-
 i386/i386/idt.c                     |    6 +-
 i386/i386/idt_inittab.S             |   12 +-
 i386/i386/ktss.c                    |    6 +-
 i386/i386/ldt.c                     |   18 +-
 i386/i386/locore.S                  |   48 +-
 i386/i386/mp_desc.c                 |    6 +-
 i386/i386/pcb.c                     |   24 +-
 i386/i386/proc_reg.h                |   16 +-
 i386/i386/seg.h                     |   18 +-
 i386/i386/trap.c                    |    6 +-
 i386/i386/user_ldt.c                |   22 +-
 i386/i386/user_ldt.h                |    4 +-
 i386/i386/vm_param.h                |   25 +-
 i386/i386/xen.h                     |    6 +
 i386/i386at/model_dep.c             |    8 +-
 i386/intel/pmap.c                   |  195 +++++----
 i386/intel/pmap.h                   |   10 +-
 i386/xen/xen_boothdr.S              |   20 +-
 include/mach/gnumach.defs           |   39 ++
 include/mach/mach_types.h           |    1 +
 include/mach/syscall_sw.h           |    1 +
 include/mach/vm_cache_statistics.h  |   41 ++
 include/mach/xen.h                  |    6 +
 ipc/ipc_mqueue.c                    |    4 +
 ipc/ipc_object.c                    |    5 +
 ipc/ipc_port.c                      |    3 +
 ipc/ipc_pset.c                      |    4 +
 ipc/ipc_table.c                     |    7 +-
 ipc/ipc_thread.h                    |    6 +
 ddb/db_input.h => kern/gnumach.srv  |   23 +-
 kern/ipc_kobject.c                  |   13 +-
 kern/kalloc.h                       |    2 -
 kern/rbtree.h                       |  164 ++++----
 kern/sched_prim.c                   |    3 +
 kern/slab.c                         |   68 ++--
 kern/slab.h                         |    5 +
 kern/startup.c                      |    4 +-
 kern/syscall_subr.c                 |   16 +
 kern/syscall_subr.h                 |    1 +
 kern/syscall_sw.c                   |    6 +-
 kern/task.c                         |   31 ++
 kern/task.h                         |    9 +
 kern/thread.c                       |   12 +-
 linux/configfrag.ac                 |   29 +-
 linux/dev/drivers/block/floppy.c    |    2 +
 linux/dev/glue/block.c              |   34 ++-
 linux/src/arch/i386/kernel/bios32.c |   24 +-
 linux/src/drivers/block/ide.c       |   79 +++--
 linux/src/drivers/block/ide.h       |    6 +-
 linux/src/drivers/block/triton.c    |  820 +++++++++++++++++++++++++++--------
 linux/src/drivers/net/pci-scan.c    |    2 +-
 linux/src/drivers/scsi/eata.c       |    2 +-
 linux/src/drivers/scsi/hosts.c      |    2 +
 linux/src/drivers/scsi/ncr53c8xx.c  |    4 +-
 linux/src/include/linux/hdreg.h     |   49 ++-
 vm/vm_fault.c                       |    7 +
 vm/vm_map.c                         |    8 +
 vm/vm_map.h                         |    3 +-
 vm/vm_object.c                      |   18 +
 vm/vm_object.h                      |   23 +-
 vm/vm_pageout.c                     |    1 +
 vm/vm_resident.c                    |   20 +
 vm/vm_user.c                        |   27 ++
 vm/vm_user.h                        |    2 +
 xen/configfrag.ac                   |   34 ++-
 xen/console.c                       |    2 +
 xen/store.c                         |    2 +
 73 files changed, 1581 insertions(+), 615 deletions(-)
 create mode 100644 include/mach/gnumach.defs
 create mode 100644 include/mach/vm_cache_statistics.h
 copy ddb/db_input.h => kern/gnumach.srv (51%)


hooks/post-receive
-- 
GNU Mach