Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c96c142 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/urgent' into tracing/core 



Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 3c355863 8ad80731

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ your e-mail client so that it sends your patches untouched. 
When sending patches to Linus, always follow step #7.



Large changes are not appropriate for mailing lists, and some

maintainers.  If your patch, uncompressed, exceeds 40 kB in size,

maintainers.  If your patch, uncompressed, exceeds 300 kB in size,

it is preferred that you store your patch on an Internet-accessible

server, and provide instead a URL (link) pointing to your patch.

Documentation/arm/tcm.txt

+6 −4
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ TCM location and size. Notice that this is not a MMU table: you 
actually move the physical location of the TCM around. At the

place you put it, it will mask any underlying RAM from the

CPU so it is usually wise not to overlap any physical RAM with

the TCM. The TCM memory exists totally outside the MMU and will

override any MMU mappings.

the TCM.



Code executing inside the ITCM does not "see" any MMU mappings

and e.g. register accesses must be made to physical addresses.

The TCM memory can then be remapped to another address again using

the MMU, but notice that the TCM if often used in situations where

the MMU is turned off. To avoid confusion the current Linux

implementation will map the TCM 1 to 1 from physical to virtual

memory in the location specified by the machine.



TCM is used for a few things:

Documentation/connector/cn_test.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static char cn_test_name[] = "cn_test"; 
static struct sock *nls;

static struct timer_list cn_test_timer;



static void cn_test_callback(struct cn_msg *msg)

static void cn_test_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)

{

	pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",

	        __func__, jiffies, msg->id.idx, msg->id.val,

Documentation/connector/connector.txt

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ handling, etc... The Connector driver allows any kernelspace agents to use 
netlink based networking for inter-process communication in a significantly

easier way:



int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *));

int cn_add_callback(struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));

void cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask);



struct cb_id
@@ -53,15 +53,15 @@ struct cn_msg 
Connector interfaces.

/*****************************************/



int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *));

int cn_add_callback(struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));



 Registers new callback with connector core.



 struct cb_id *id		- unique connector's user identifier.

				  It must be registered in connector.h for legal in-kernel users.

 char *name			- connector's callback symbolic name.

 void (*callback) (void *)	- connector's callback.

				  Argument must be dereferenced to struct cn_msg *.

 void (*callback) (struct cn..)	- connector's callback.

				  cn_msg and the sender's credentials





void cn_del_callback(struct cb_id *id);

Documentation/networking/timestamping/timestamping.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int main(int argc, char **argv) 
	memset(&hwtstamp, 0, sizeof(hwtstamp));

	strncpy(hwtstamp.ifr_name, interface, sizeof(hwtstamp.ifr_name));

	hwtstamp.ifr_data = (void *)&hwconfig;

	memset(&hwconfig, 0, sizeof(&hwconfig));

	memset(&hwconfig, 0, sizeof(hwconfig));

	hwconfig.tx_type =

		(so_timestamping_flags & SOF_TIMESTAMPING_TX_HARDWARE) ?

		HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;