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

Commit 8a8ad3da authored by Amit Pundir's avatar Amit Pundir
Browse files

ANDROID: ktime: Fix ktime references 



Upstream commit 2456e855 ("ktime: Get rid of the union") got
rid of ktime union, just kept ktime_t as simple typedef of type s64.
So remove ktime.tv64 references and use ktime directly instead.

Also include <linux/ktime.h> to declare ktime_t type.

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 7bafb1d0

drivers/input/misc/gpio_input.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id) 


	key_entry = &ds->info->keymap[keymap_index];



	if (ds->info->debounce_time.tv64) {

	if (ds->info->debounce_time) {

		spin_lock_irqsave(&ds->irq_lock, irqflags);

		if (ks->debounce & DEBOUNCE_WAIT_IRQ) {

			ks->debounce = DEBOUNCE_UNKNOWN;

include/linux/mmc/core.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/completion.h>

#include <linux/types.h>

#include <linux/ktime.h>



struct mmc_data;

struct mmc_request;

net/netfilter/xt_quota2.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void quota2_log(unsigned int hooknum, 
		return;

	}

	pm = nlmsg_data(nlh);

	if (skb->tstamp.tv64 == 0)

	if (skb->tstamp == 0)

		__net_timestamp((struct sk_buff *)skb);

	pm->data_len = 0;

	pm->hook = hooknum;