Changeset eb083ad in mainline

Timestamp:

2012-05-17T21:09:06Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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

Files:

• HelenOS.config (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• kernel/arch/amd64/include/mm/page.h (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/generic/include/lib/ra.h (modified) (view diffs)
• kernel/generic/include/mm/slab.h (modified) (view diffs)
• kernel/generic/src/lib/ra.c (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/synch/mutex.c (modified) (view diffs)
• kernel/generic/src/synch/spinlock.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/inet/Makefile (moved) (moved from uspace/app/inetcfg/Makefile ) (view diffs)
• uspace/app/inet/inet.c (moved) (moved from uspace/app/inetcfg/inetcfg.c ) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/loc/Makefile (moved) (moved from uspace/app/locinfo/Makefile ) (view diffs)
• uspace/app/loc/loc.c (moved) (moved from uspace/app/locinfo/locinfo.c ) (view diffs)
• uspace/app/nterm/Makefile (added)
• uspace/app/nterm/conn.c (added)
• uspace/app/nterm/conn.h (moved) (moved from uspace/lib/c/include/net/modules.h ) (view diffs)
• uspace/app/nterm/nterm.c (added)
• uspace/app/nterm/nterm.h (added)
• uspace/app/sbi/src/stype.c (modified) (view diffs)
• uspace/app/websrv/websrv.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/generic/net/modules.c (deleted)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/ns.c (modified) (view diffs)
• uspace/lib/c/include/ns.h (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/lib/usb/include/usb/debug.h (modified) (view diffs)
• uspace/lib/usb/src/hc.c (modified) (view diffs)
• uspace/srv/locsrv/Makefile (moved) (moved from uspace/srv/loc/Makefile ) (view diffs)
• uspace/srv/locsrv/category.c (moved) (moved from uspace/srv/loc/category.c ) (view diffs)
• uspace/srv/locsrv/category.h (moved) (moved from uspace/srv/loc/category.h ) (view diffs)
• uspace/srv/locsrv/locsrv.c (moved) (moved from uspace/srv/loc/loc.c ) (view diffs)
• uspace/srv/locsrv/locsrv.h (moved) (moved from uspace/srv/loc/loc.h ) (view diffs)
• uspace/srv/net/inetsrv/Makefile (moved) (moved from uspace/srv/net/inet/Makefile ) (view diffs)
• uspace/srv/net/inetsrv/addrobj.c (moved) (moved from uspace/srv/net/inet/addrobj.c ) (view diffs)
• uspace/srv/net/inetsrv/addrobj.h (moved) (moved from uspace/srv/net/inet/addrobj.h ) (view diffs)
• uspace/srv/net/inetsrv/icmp.c (moved) (moved from uspace/srv/net/inet/icmp.c ) (view diffs)
• uspace/srv/net/inetsrv/icmp.h (moved) (moved from uspace/srv/net/inet/icmp.h ) (view diffs)
• uspace/srv/net/inetsrv/icmp_std.h (moved) (moved from uspace/srv/net/inet/icmp_std.h ) (view diffs)
• uspace/srv/net/inetsrv/inet_link.c (moved) (moved from uspace/srv/net/inet/inet_link.c ) (view diffs)
• uspace/srv/net/inetsrv/inet_link.h (moved) (moved from uspace/srv/net/inet/inet_link.h ) (view diffs)
• uspace/srv/net/inetsrv/inet_std.h (moved) (moved from uspace/srv/net/inet/inet_std.h ) (view diffs)
• uspace/srv/net/inetsrv/inet_util.c (moved) (moved from uspace/srv/net/inet/inet_util.c ) (view diffs)
• uspace/srv/net/inetsrv/inet_util.h (moved) (moved from uspace/srv/net/inet/inet_util.h ) (view diffs)
• uspace/srv/net/inetsrv/inetcfg.c (moved) (moved from uspace/srv/net/inet/inetcfg.c ) (view diffs)
• uspace/srv/net/inetsrv/inetcfg.h (moved) (moved from uspace/srv/net/inet/inetcfg.h ) (view diffs)
• uspace/srv/net/inetsrv/inetping.c (moved) (moved from uspace/srv/net/inet/inetping.c ) (view diffs)
• uspace/srv/net/inetsrv/inetping.h (moved) (moved from uspace/srv/net/inet/inetping.h ) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.c (moved) (moved from uspace/srv/net/inet/inet.c ) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.h (moved) (moved from uspace/srv/net/inet/inet.h ) (view diffs)
• uspace/srv/net/inetsrv/pdu.c (moved) (moved from uspace/srv/net/inet/pdu.c ) (view diffs)
• uspace/srv/net/inetsrv/pdu.h (moved) (moved from uspace/srv/net/inet/pdu.h ) (view diffs)
• uspace/srv/net/inetsrv/reass.c (moved) (moved from uspace/srv/net/inet/reass.c ) (view diffs)
• uspace/srv/net/inetsrv/reass.h (moved) (moved from uspace/srv/net/inet/reass.h ) (view diffs)
• uspace/srv/net/inetsrv/sroute.c (moved) (moved from uspace/srv/net/inet/sroute.c ) (view diffs)
• uspace/srv/net/inetsrv/sroute.h (moved) (moved from uspace/srv/net/inet/sroute.h ) (view diffs)
• uspace/srv/net/tcp/conn.c (modified) (view diffs)
• uspace/srv/net/tcp/ncsim.c (modified) (view diffs)
• uspace/srv/net/tcp/ncsim.h (modified) (view diffs)
• uspace/srv/net/tcp/rqueue.c (modified) (view diffs)
• uspace/srv/net/tcp/rqueue.h (modified) (view diffs)
• uspace/srv/net/tcp/segment.c (modified) (view diffs)
• uspace/srv/net/tcp/sock.c (modified) (view diffs)
• uspace/srv/net/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tcp/tcp_type.h (modified) (view diffs)
• uspace/srv/net/tcp/test.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)